diff --git a/configuration.nix b/configuration.nix
index 07e258e..26cfec6 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,14 +5,13 @@ let
 in
 {
   imports = [
-    ./hardware-configuration.nix
-    ./users.nix
     ./generic/api/api.nix
     ./generic/api/api-module.nix
     ./generic/modules/userdata.nix
     ./generic/services/userdata.nix
     ./generic/systems/limits.nix
     ./generic/systems/tmpfiles.nix
+    ./generic/systems/users.nix
     ./local/services/backup/restic.nix
     ./local/services/git/gitea.nix
     ./local/services/letsencrypt/acme.nix
@@ -27,6 +26,7 @@ in
     ./local/services/vpn/ocserv.nix
     ./local/services/webserver/memcached.nix
     ./local/services/webserver/nginx.nix
+    ./hardware-configuration.nix
   ];
 
   nixpkgs.overlays = [ (nix-overlay) ];
diff --git a/users.nix b/generic/systems/users.nix
similarity index 100%
rename from users.nix
rename to generic/systems/users.nix