diff --git a/devices/android/nix-on-droid.nix b/devices/android/nix-on-droid.nix
index a45d4aa..e0a687d 100644
--- a/devices/android/nix-on-droid.nix
+++ b/devices/android/nix-on-droid.nix
@@ -1,4 +1,9 @@
-{pkgs, ...}: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   vars = {
     mainUser = "nix-on-droid";
     hostName = "localhost";
@@ -13,27 +18,47 @@
     ];
   })}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf";
 
-  environment.packages = with pkgs; [
-    diffutils
-    findutils
-    utillinux
-    tzdata
-    hostname
-    man
-    gnugrep
-    ripgrep
-    gnupg
-    gnused
-    gnutar
-    bzip2
-    gzip
-    xz
-    zip
-    unzip
-    openssh
-    perl
-    alejandra
-  ];
+  environment.packages =
+    (with pkgs; [
+      diffutils
+      findutils
+      utillinux
+      tzdata
+      hostname
+      man
+      gnugrep
+      ripgrep
+      gnupg
+      gnused
+      gnutar
+      bzip2
+      gzip
+      xz
+      zip
+      unzip
+      openssh
+      perl
+      which
+      alejandra
+    ])
+    ++ [
+      (pkgs.writeShellApplication {
+        name = "switch";
+        runtimeInputs = with pkgs; [
+          nix-output-monitor
+        ];
+        text = ''
+          exec nix-on-droid ${lib.concatStringsSep " " [
+            "switch"
+            "--flake ${config.environment.variables.FLAKE}"
+            "--builders ssh-ng://matt@100.64.0.7"
+            ''"$@"''
+            "|&"
+            "nom"
+          ]}
+        '';
+      })
+    ];
 
   environment.etcBackupExtension = ".bak";
   environment.motd = null;
diff --git a/devices/servivi/default.nix b/devices/servivi/default.nix
index 0bb496f..8936923 100644
--- a/devices/servivi/default.nix
+++ b/devices/servivi/default.nix
@@ -37,7 +37,7 @@ in {
       homeMode = "500";
 
       openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGOujvC5JLnyjqD1bzl/H0256Gxw/biu7spIHy3YJiDL root@oksys"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGOujvC5JLnyjqD1bzl/H0256Gxw/biu7spIHy3YJiDL"
       ];
     };
   };
diff --git a/devices/servivi/hardware-configuration.nix b/devices/servivi/hardware-configuration.nix
index eb9067e..f598469 100644
--- a/devices/servivi/hardware-configuration.nix
+++ b/devices/servivi/hardware-configuration.nix
@@ -35,6 +35,9 @@
         configurationLimit = 30;
       };
     };
+
+    # Support building binaries for arm64
+    binfmt.emulatedSystems = ["aarch64-linux"];
   };
 
   fileSystems = {