diff --git a/templates/new-clan/flake.nix b/templates/new-clan/flake.nix
index 36cb6f3fa..cc873d975 100644
--- a/templates/new-clan/flake.nix
+++ b/templates/new-clan/flake.nix
@@ -24,6 +24,8 @@
               ./machines/jon/hardware-configuration.nix
             ];
 
+            nixpkgs.hostPlatform = system;
+
             clanCore.machineIcon = null; # Optional, a path to an image file
 
             # Set this for clan commands use ssh i.e. `clan machines update`
@@ -43,9 +45,11 @@
             imports = [
               ./modules/shared.nix
               ./machines/sara/configuration.nix
-              ./machines/jon/hardware-configuration.nix
+              ./machines/sara/hardware-configuration.nix
             ];
 
+            nixpkgs.hostPlatform = system;
+
             clanCore.machineIcon = null; # Optional, a path to an image file
 
             # Set this for clan commands use ssh i.e. `clan machines update`
diff --git a/templates/new-clan/machines/jon/configuration.nix b/templates/new-clan/machines/jon/configuration.nix
index b98037b31..a6d0abeeb 100644
--- a/templates/new-clan/machines/jon/configuration.nix
+++ b/templates/new-clan/machines/jon/configuration.nix
@@ -1,6 +1,5 @@
 { ... }:
 {
-
   users.users.root.openssh.authorizedKeys.keys = [
     # IMPORTANT! Add your SSH key here
     # e.g. > cat ~/.ssh/id_ed25519.pub
diff --git a/templates/new-clan/modules/shared.nix b/templates/new-clan/modules/shared.nix
index cae7a65ae..bb6bb5c28 100644
--- a/templates/new-clan/modules/shared.nix
+++ b/templates/new-clan/modules/shared.nix
@@ -1,9 +1,8 @@
-{clan-core, system, ...}:
+{clan-core, ...}:
 {
   imports = [
     clan-core.clanModules.sshd
     clan-core.clanModules.diskLayouts
     clan-core.clanModules.root-password
   ];
-  nixpkgs.hostPlatform = system;
 }