diff --git a/devices/binto/default.nix b/devices/binto/default.nix
index c3498650..9c9dfe39 100644
--- a/devices/binto/default.nix
+++ b/devices/binto/default.nix
@@ -13,7 +13,6 @@ in {
 
     ./modules
 
-    self.nixosModules.adb
     self.nixosModules.desktop
     self.nixosModules.kmscon
     self.nixosModules.server
@@ -36,9 +35,12 @@ in {
       "adm"
       "video"
       "libvirtd"
+      "adbusers"
     ];
   };
 
+  programs.adb.enable = true;
+
   networking = {
     hostName = "binto";
     networkmanager.enable = true;
@@ -66,11 +68,6 @@ in {
     sshd.enable = true;
   };
 
-  programs.adb = {
-    enable = true;
-    user = mainUser;
-  };
-
   services.kmscon.enable = true;
 
   home-manager.users.${mainUser} = {
diff --git a/devices/wim/default.nix b/devices/wim/default.nix
index fa6f5409..6e6661e8 100644
--- a/devices/wim/default.nix
+++ b/devices/wim/default.nix
@@ -14,7 +14,6 @@ in {
 
     ./modules
 
-    self.nixosModules.adb
     self.nixosModules.desktop
     self.nixosModules.docker
     self.nixosModules.kmscon
@@ -39,9 +38,12 @@ in {
       "adm"
       "video"
       "libvirtd"
+      "adbusers"
     ];
   };
 
+  programs.adb.enable = true;
+
   networking = {
     hostName = "wim";
     networkmanager = {
@@ -76,11 +78,6 @@ in {
     tailscale.enable = true;
   };
 
-  programs.adb = {
-    enable = true;
-    user = mainUser;
-  };
-
   boot.plymouth = {
     enable = true;
     theme = "dracula";
diff --git a/nixosModules/adb/default.nix b/nixosModules/adb/default.nix
deleted file mode 100644
index 93197ae2..00000000
--- a/nixosModules/adb/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib) mkIf mkOption types;
-
-  cfg = config.programs.adb;
-in {
-  options.programs.adb = {
-    user = mkOption {
-      type = types.str;
-      default = "root";
-      description = ''
-        The name of the user who is going to interact with
-        the android devices.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    users.users.${cfg.user}.extraGroups = ["adbusers"];
-  };
-
-  # For accurate stack trace
-  _file = ./default.nix;
-}
diff --git a/nixosModules/default.nix b/nixosModules/default.nix
index 2566f121..1aec6d76 100644
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@@ -1,5 +1,4 @@
 self: {
-  adb = import ./adb;
   borgbackup = import ./borgbackup;
   desktop = import ./desktop self;
   docker = import ./docker self.inputs.khepri;
diff --git a/nixosModules/server/sshd.nix b/nixosModules/server/sshd.nix
index 8c56cd0e..d144b404 100644
--- a/nixosModules/server/sshd.nix
+++ b/nixosModules/server/sshd.nix
@@ -18,6 +18,7 @@ in {
       };
     };
 
+    # FIXME: Move to mkNixOS
     users.users.${cfg.user} = {
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE39uk52+NIDLdHeoSHIEsOUUFRzj06AGn09z4TUOYm matt@OP9"