diff --git a/.gitattributes b/.gitattributes
index 8a2a458..44891c0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-users/user.nix filter=git-crypt diff=git-crypt
+common/users/user.nix filter=git-crypt diff=git-crypt
diff --git a/common/default.nix b/common/default.nix
new file mode 100644
index 0000000..d01f589
--- /dev/null
+++ b/common/default.nix
@@ -0,0 +1,3 @@
+{ ... }: {
+  imports = [ ./nix.nix ./users ];
+}
diff --git a/nix.nix b/common/nix.nix
similarity index 100%
rename from nix.nix
rename to common/nix.nix
diff --git a/users/default.nix b/common/users/default.nix
similarity index 100%
rename from users/default.nix
rename to common/users/default.nix
diff --git a/users/user.nix b/common/users/user.nix
similarity index 100%
rename from users/user.nix
rename to common/users/user.nix
diff --git a/flake.nix b/flake.nix
index 468b505..07b272f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,8 +44,6 @@
         system = "x86_64-linux";
         specialArgs = inputs;
         modules = [
-          ./nix.nix
-
           {
             nixpkgs.overlays = [ (import ./packages) hyprland.overlays.default ];
             nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "x86_64-linux";
@@ -56,8 +54,8 @@
           impermanence.nixosModules.impermanence
           lanzaboote.nixosModules.lanzaboote
 
+          ./common
           ./hosts/skipper
-          ./users
           ./home
         ];
       };
@@ -65,15 +63,13 @@
         system = "aarch64-linux";
         specialArgs = inputs;
         modules = [
-          ./nix.nix
-
           {
             nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "aarch64-linux";
             system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
           }
 
+          ./common
           ./hosts/rico
-          ./users
         ];
       };
     };