diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index 5805526..cc4ac1f 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -1,6 +1,6 @@
 { self, ... }:
 {
-  imports = [ ./hardware-configuration.nix ../../users/erwin.nix ../../users/root.nix ];
+  imports = [ ./hardware-configuration.nix ../../users/erwin ../../users/root ];
 
   eboskma = {
     base = {
@@ -12,18 +12,22 @@
       enable = true;
       home-manager = true;
     };
-    nix-common = {
+    docker.enable = true;
+    fonts.enable = true;
+    gnome.enable = true;
+    greetd.enable = true;
+    home-manager = {
+      inherit (users) users;
       enable = true;
     };
-    greetd.enable = true;
-    fonts.enable = true;
     networking = {
       enable = true;
       dhcpInterfaces = [ "enp4s0" ];
     };
+    nix-common = {
+      enable = true;
+    };
     sound.enable = true;
-    docker.enable = true;
-    gnome.enable = true;
   };
 
   boot.loader.systemd-boot.enable = true;
diff --git a/users/erwin.nix b/users/erwin/default.nix
similarity index 100%
rename from users/erwin.nix
rename to users/erwin/default.nix
diff --git a/users/erwin/desktop.nix b/users/erwin/desktop.nix
new file mode 100644
index 0000000..e69de29
diff --git a/users/root.nix b/users/root/default.nix
similarity index 100%
rename from users/root.nix
rename to users/root/default.nix