diff --git a/flake.nix b/flake.nix
index 497dc82..36ca042 100644
--- a/flake.nix
+++ b/flake.nix
@@ -136,7 +136,7 @@
           };
 
         flake.nixosModules = {
-          common = ./modules/nixos/common.nix;
+          common = ./modules/nixos/common;
 
           community-builder = ./modules/nixos/community-builder;
           hercules-ci = ./modules/nixos/hercules-ci;
diff --git a/modules/nixos/auto-upgrade.nix b/modules/nixos/common/auto-upgrade.nix
similarity index 100%
rename from modules/nixos/auto-upgrade.nix
rename to modules/nixos/common/auto-upgrade.nix
diff --git a/modules/nixos/common.nix b/modules/nixos/common/default.nix
similarity index 100%
rename from modules/nixos/common.nix
rename to modules/nixos/common/default.nix
diff --git a/modules/nixos/nix-daemon.nix b/modules/nixos/common/nix-daemon.nix
similarity index 100%
rename from modules/nixos/nix-daemon.nix
rename to modules/nixos/common/nix-daemon.nix
diff --git a/modules/nixos/security.nix b/modules/nixos/common/security.nix
similarity index 100%
rename from modules/nixos/security.nix
rename to modules/nixos/common/security.nix
diff --git a/modules/nixos/sops-nix.nix b/modules/nixos/common/sops-nix.nix
similarity index 100%
rename from modules/nixos/sops-nix.nix
rename to modules/nixos/common/sops-nix.nix
diff --git a/modules/nixos/users.nix b/modules/nixos/common/users.nix
similarity index 100%
rename from modules/nixos/users.nix
rename to modules/nixos/common/users.nix