diff --git a/machines/bakunin/configuration.nix b/machines/bakunin/configuration.nix
index 7b6421c..5fc0734 100644
--- a/machines/bakunin/configuration.nix
+++ b/machines/bakunin/configuration.nix
@@ -8,12 +8,11 @@ in
     [ # Include the results of the hardware scan.
       #./hardware-configuration.nix
       ../modules/xserver.nix
-      ../modules/malobeo_user.nix
       ../modules/sshd.nix
-      ../modules/minimal_tools.nix
       ../modules/autoupdate.nix
       inputs.self.nixosModules.malobeo.disko
       inputs.self.nixosModules.malobeo.initssh
+      inputs.self.nixosModules.malobeo.users
     ];
 
   malobeo.autoUpdate = {
@@ -38,6 +37,8 @@ in
     ethernetDrivers = ["r8169"];
   };
 
+  malobeo.users.malobeo = true;
+
   hardware.sane.enable = true; #scanner support
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
diff --git a/machines/modules/malobeo/users.nix b/machines/modules/malobeo/users.nix
index 484ed71..e216c03 100644
--- a/machines/modules/malobeo/users.nix
+++ b/machines/modules/malobeo/users.nix
@@ -1,7 +1,7 @@
-{config, lib, pkgs, ...}:
+{config, lib, pkgs, inputs, ...}:
 let 
   cfg = config.malobeo.users;
-  sshKeys = import ../ssh_keys.nix;
+  sshKeys = import ( inputs.self + /machines/ssh_keys.nix);
 in
 {
   options.malobeo.users = {
@@ -21,7 +21,7 @@ in
       environment.systemPackages = with pkgs; [];
     })
     (lib.mkIf cfg.admin {
-      users.user.admin = {
+      users.users.admin = {
         isNormalUser = true;
         description = "admin user, passwordless sudo access, only ssh";
         hashedPassword = null;
diff --git a/outputs.nix b/outputs.nix
index c8dac17..62c922f 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -113,6 +113,7 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
       initssh.imports = [ ./machines/modules/malobeo/initssh.nix ];
       metrics.imports = [ ./machines/modules/malobeo/metrics.nix ];
       disko.imports = [ ./machines/modules/disko ];
+      users.imports = [ ./machines/modules/malobeo/users.nix ];
     };
 
     hydraJobs = nixpkgs.lib.mapAttrs (_: nixpkgs.lib.hydraJob) (