diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index 2f8e3a763..17808e60b 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -90,19 +90,19 @@
         }
       );
 
-      # Home Manager configurations for each user/machine
-      homeConfigurations = lib.genAttrs machines (
-        machine:
+      homeConfigurations = lib.genAttrs (map (machine: user.username + "@" + machine) machines) (
+        userMachine:
+        let
+          username = lib.splitString "@" userMachine !!"";
+          machine = lib.splitString "@" userMachine !!"";
+        in
         home-manager.lib.homeManagerConfiguration {
           inherit system;
-          configuration = import ./assets/flake/users/${user.username}/home.nix {
+          configuration = import ./assets/flake/users/${username}/home.nix {
             inherit inputs user;
             pkgs = import nixpkgs { inherit system; };
           };
-          extraSpecialArgs = {
-            inherit user inputs;
-            flakeRoot = ./.;
-          };
+          extraSpecialArgs = { inherit user inputs; flakeRoot = ./.; };
         }
       );