diff --git a/modules/home/default.nix b/modules/home/default.nix
index 88cf1ad..92fb921 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -37,7 +37,7 @@ in
     home-manager.useGlobalPkgs = true;
     home-manager.useUserPackages = true;
     home-manager.extraSpecialArgs = inputs;
-    home-manager.users = mapAttrs (name: userconfig: (import ./home.nix (inputs // { name = name; userconfig = userconfig; }))) cfg.users;
+    home-manager.users = mapAttrs (name: userconfig: import ./home.nix) cfg.users;
   };
 }
 
diff --git a/modules/system/system.nix b/modules/system/system.nix
index 7f96ec6..ffa7ad6 100644
--- a/modules/system/system.nix
+++ b/modules/system/system.nix
@@ -28,13 +28,6 @@
     nixd
   ];
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.florian = {
-    isNormalUser = true;
-    description = "florian";
-    extraGroups = [ "networkmanager" "wheel" ];
-  };
-
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Configure network proxy if necessary