diff --git a/flake.nix b/flake.nix
index dbf80a8..6d4c204 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,20 +81,7 @@
       };
       pochita = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
-        modules = [
-          ./hosts/pochita/configuration.nix
-          raspberry-pi-nix.nixosModules.raspberry-pi
-          nixos-hardware.nixosModules.raspberry-pi-5
-          vscode-server.nixosModules.default
-          agenix.nixosModules.default
-          home-manager.nixosModules.home-manager
-          {
-            environment.systemPackages = [
-              agenix.packages.aarch64-linux.default
-              osbm-nvim.packages.aarch64-linux.default
-            ];
-          }
-        ];
+        modules = [./hosts/pochita/configuration.nix];
       };
       pochita-sd = nixpkgs.lib.nixosSystem {
         modules = [
diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix
index e7d022c..cb44d65 100644
--- a/hosts/pochita/configuration.nix
+++ b/hosts/pochita/configuration.nix
@@ -2,34 +2,28 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }: {
   imports = [
     ./hardware-configuration.nix
     ../../modules
+    inputs.raspberry-pi-nix.nixosModules.raspberry-pi
+    inputs.nixos-hardware.nixosModules.raspberry-pi-5
+    inputs.vscode-server.nixosModules.default
+    inputs.agenix.nixosModules.default
+    inputs.home-manager.nixosModules.home-manager
   ];
 
-  nix.distributedBuilds = true;
-  nix.buildMachines = [
-    {
-      hostName = "192.168.0.2";
-      systems = ["x86_64-linux" "aarch64-linux"];
-      supportedFeatures = ["big-parallel" "kvm"];
-      sshKey = "/home/osbm/.ssh/id_ed25519";
-      sshUser = "osbm";
-    }
-  ];
   myModules = {
     enableKDE = false;
     enableFonts = false;
     blockYoutube = false;
     blockTwitter = false;
     enableTailscale = true;
-    # enableJellyfin = true;
   };
 
   i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method
-  programs.firefox.enable = lib.mkForce false; # no need for firefox
 
   # enable hyprland
   # programs.hyprland.enable = true;
diff --git a/modules/default.nix b/modules/default.nix
index 1d09326..9d30420 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -10,6 +10,7 @@
     ./i18n.nix
     ./jellyfin.nix
     ./nix-settings.nix
+    ./remote-builds.nix
     ./secrets.nix
     ./sound.nix
     ./tailscale.nix
diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix
new file mode 100644
index 0000000..67e14a0
--- /dev/null
+++ b/modules/remote-builds.nix
@@ -0,0 +1,15 @@
+{config, outputs, ...}:{
+
+  nix.distributedBuilds = true;
+  nix.builders-use-substitutes = true;
+  nix.buildMachines = [
+    {
+      hostName = "ymir.curl-boga.ts.net";
+      systems = ["x86_64-linux" "aarch64-linux"];
+      supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features;
+      sshKey = config.age.secrets.ssh-key-private.path;
+      sshUser = "osbm";
+      protocol = "ssh-ng";
+    }
+  ];
+}
\ No newline at end of file