diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index e2268220..7dc8ee0d 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -5,6 +5,7 @@
     ./fs.nix
     ./hardware
     ./home
+    ./hostnames.nix
     ./hosts.nix
     ./ids.nix
     ./machine-id.nix
diff --git a/hosts/modules/hostnames.nix b/hosts/common/hostnames.nix
similarity index 100%
rename from hosts/modules/hostnames.nix
rename to hosts/common/hostnames.nix
diff --git a/hosts/modules/default.nix b/hosts/modules/default.nix
index fb31b2f9..9f65ed32 100644
--- a/hosts/modules/default.nix
+++ b/hosts/modules/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ./derived-secrets
     ./gui
-    ./hostnames.nix
     ./hosts.nix
     ./nixcache.nix
     ./roles