diff --git a/hosts/default.nix b/hosts/default.nix
index ff01267..d2c344b 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,10 +1,12 @@
 { unstable, stable2009 }:
 let
 
-  commonModules = [
-    ../.
+  commonModules = name: [
+    (../.)
+    (./. + "/${name}")
     ({ ... }: {
       config = {
+        networking.hostName = name;
         sconfig.flakes.enable = true;
         sconfig.flakes.rebuildPath = "github:buckley310/nixos-config";
       };
@@ -13,17 +15,15 @@ let
 
   mkStandardSystem = { name, pkgs }: pkgs.lib.nixosSystem {
     system = "x86_64-linux";
-    modules = commonModules ++ [
+    modules = (commonModules name) ++ [
       pkgs.nixosModules.notDetected
-      (./. + "/${name}")
     ];
   };
 
   mkQemuSystem = { name, pkgs }: pkgs.lib.nixosSystem {
     system = "x86_64-linux";
-    modules = commonModules ++ [
+    modules = (commonModules name) ++ [
       (x: { imports = [ "${x.modulesPath}/profiles/qemu-guest.nix" ]; })
-      (./. + "/${name}")
     ];
   };
 
diff --git a/hosts/hp/default.nix b/hosts/hp/default.nix
index afad871..e90dfa1 100644
--- a/hosts/hp/default.nix
+++ b/hosts/hp/default.nix
@@ -12,7 +12,6 @@
   };
 
   networking = {
-    hostName = "hp";
     search = [ "bck.me" ];
   };
 
diff --git a/hosts/manta/default.nix b/hosts/manta/default.nix
index d506eb6..02ff02d 100644
--- a/hosts/manta/default.nix
+++ b/hosts/manta/default.nix
@@ -5,7 +5,6 @@
   services.tlp.enable = true;
   services.openssh.enable = true;
 
-  networking.hostName = "manta";
   networking.search = [ "bck.me" ];
 
   sconfig = {
diff --git a/hosts/neo/default.nix b/hosts/neo/default.nix
index 004f882..f55434e 100644
--- a/hosts/neo/default.nix
+++ b/hosts/neo/default.nix
@@ -7,7 +7,6 @@
   };
 
   networking = {
-    hostName = "neo";
     search = [ "bck.me" ];
   };
 
diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix
index 0a9cd3c..da04115 100644
--- a/hosts/vm/default.nix
+++ b/hosts/vm/default.nix
@@ -1,6 +1,5 @@
 { ... }:
 {
-  networking.hostName = "vm";
   sconfig.profile = "server";
   boot.loader.grub.device = "/dev/vda";
   fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };