diff --git a/hosts/takamaki/default.nix b/hosts/takamaki/default.nix
index 7c6c7dc..dbf984d 100644
--- a/hosts/takamaki/default.nix
+++ b/hosts/takamaki/default.nix
@@ -17,6 +17,7 @@ in {
     "${modules-dir}/zsh.nix"
     ./modules/openssh.nix
     ./modules/sudo.nix
+    ./modules/remote-builder.nix
   ];
 
   nixpkgs.overlays = [ 
diff --git a/hosts/takamaki/modules/remote-builder.nix b/hosts/takamaki/modules/remote-builder.nix
new file mode 100644
index 0000000..e9a175e
--- /dev/null
+++ b/hosts/takamaki/modules/remote-builder.nix
@@ -0,0 +1,18 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  users.users.remotebuild = {
+    isSystemUser = true;
+    group = "remotebuild";
+    useDefaultShell = true;
+
+    # also uses id_takamaki for simplicity's sake
+    openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCeYFzFyv1LEdWngyTDqnsdJQhmgAfQbbksyZrNWkameVMJpi8IJ+3IIrL96BtD8EAC/jxHIbri49TInN0lYRBH3cH3jbBupdDFaziH3ohyMoeg8enKYsiisaT+MTGEGFygF9Ul1WDrOM1oThEP1LTYj5pWNfZRtIG870jLzRkNczb0eCtEO0qWtyH92Cb5BSpXBKd4Eaysvkm5ex77I5Y1Hl0RUjyEiegiwC1LrcrFhjhVFQGlShTr5kf/LJrwamyGJx4oLi462Omf/jLwNoIMLNgxzuJBynYK714AY9U/IbNq//bEQro6i2cwxPm4lSTaGemnhvEItHsDfbeAJ06iqOl51OtsM2qees2ygCgFvraKNRTmOoRkhS/IwC1bqoMqR8uraYcfKlXeXBjYnJbVG6u/SAGLg7Llmt5UAs7a6/W/7ytWJ90uQVjgPcb7h+9ji+jK18EQUd/AAknfLkLE5IoU5wj6+2OTAGeCT46BbMpYOk2RJinUy93VBIPuRyvZ5tdIt76BPt3JgosYbYtbdkyZTI8V72iCVLWae1uCF2pJlZ1gLteaS0ZmkgyEsAchm8VaoE8NrIO4MBpyZ3fZ9gsprT5jsnUb9Hc+opKSgX+OwDjzM5BadCUFtvoJE3FNTv7koIDg2myHyYj+1kFxp6ctjNgP9V9/0rc4oWz9ew== grey@kitagawa" ];
+  };
+
+  users.groups.remotebuild = {};
+
+  nix.settings.trusted-users = [ "remotebuild" ];
+}
\ No newline at end of file