diff --git a/flake.nix b/flake.nix
index 8a6a4be..2eb85cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
     }: {
       imports = [
         ./hosts/${hostname}/configuration.nix
-        ./modules/common.nix
+        ./modules/nixos/common.nix
         (import "${home-manager}/nixos")
       ];
 
diff --git a/modules/common.nix b/modules/nixos/common.nix
similarity index 99%
rename from modules/common.nix
rename to modules/nixos/common.nix
index ebaf7f7..63dfe07 100644
--- a/modules/common.nix
+++ b/modules/nixos/common.nix
@@ -16,7 +16,7 @@ in {
   imports = [
     ./graphical.nix
     ./security.nix
-    ./users
+    ../users
     ./yubikey.nix
   ];
 
diff --git a/modules/graphical.nix b/modules/nixos/graphical.nix
similarity index 100%
rename from modules/graphical.nix
rename to modules/nixos/graphical.nix
diff --git a/modules/security.nix b/modules/nixos/security.nix
similarity index 100%
rename from modules/security.nix
rename to modules/nixos/security.nix
diff --git a/modules/yubikey.nix b/modules/nixos/yubikey.nix
similarity index 100%
rename from modules/yubikey.nix
rename to modules/nixos/yubikey.nix