diff --git a/os/linux/nix/flake.nix b/os/linux/nix/flake.nix
index be1a07c..e67f748 100644
--- a/os/linux/nix/flake.nix
+++ b/os/linux/nix/flake.nix
@@ -37,6 +37,10 @@
   };
 
   outputs = inputs: {
+    diskoConfigurations = {
+      encryptedUefiBtrfs = import ./machines/thinker-disks.nix;
+      normalUefiBtrfs = import ./machines/musicbox-disks.nix;
+    };
     homeConfigurations =
       let
         system = "x86_64-linux";
@@ -107,5 +111,35 @@
         ];
       };
     };
+
+    colmena = {
+      meta = {
+        nixpkgs = import inputs.nixpkgs {
+          system = "x86_64-linux";
+        };
+      };
+      musicbot = inputs.nixpkgs.lib.nixosSystem {
+        deployment = {
+          targetHost = "musicbox";
+          targetPort = 1234;
+          targetUser = "nixos";
+        };
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules =
+          [
+            inputs.disko.nixosModules.disko
+            ./machines/musicbox-disks.nix
+            { _module.args.disks = [ "/dev/sda" ]; }
+            ./machines/musicbox.nix
+            inputs.home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.daniel = import ./daniel.nix;
+            }
+          ];
+      };
+    };
   };
 }
diff --git a/os/linux/nix/machines/musicbox-disks.nix b/os/linux/nix/machines/musicbox-disks.nix
index 0f06af8..abfed2b 100644
--- a/os/linux/nix/machines/musicbox-disks.nix
+++ b/os/linux/nix/machines/musicbox-disks.nix
@@ -7,9 +7,19 @@
         content = {
           type = "gpt";
           partitions = {
-            boot = {
-              size = "1M";
-              type = "EF02";
+            ESP = {
+              label = "EFI";
+              name = "ESP";
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [
+                  "defaults"
+                ];
+              };
             };
             root = {
               size = "100%";