diff --git a/curacao/dk.nix b/curacao/dk.nix
index 3c24d91..ec42f2d 100644
--- a/curacao/dk.nix
+++ b/curacao/dk.nix
@@ -1,6 +1,5 @@
 { passwordFile ? "/should_not_be_needed_in_this_context", ... }:
 # FIXME Subvolumes for backup. If they're not created with the script. Add the script btw.
-# FIXME Make it work for NixOS, duh
 # TODO Not relatime everywhere, thank you
 # TODO Default options
 let
@@ -22,13 +21,11 @@ in
           type = "gpt";
           partitions = {
             swap = {
-              priority = 1;
+              priority = 10;
               start = "2048";
-              size = "8G";
+              size = "6G";
               content = {
                 type = "swap";
-                # I don't think I really saw this one being used, maybe we
-                # could reduce it to get more /boot space.
                 randomEncryption = true;
                 # TODO NixOS documentation says not to use this with
                 # hibernation, as it can't set the partition where the
@@ -38,8 +35,17 @@ in
                 # Untranslated options from /etc/fstab: defaults,pri=100
               };
             };
+            nixosboot = {
+              priority = 15;
+              size = "2G";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
             esp = {
-              priority = 2;
+              priority = 20;
               size = "128M";
               type = "EF00"; # EFI system partition
               content = {
@@ -61,7 +67,7 @@ in
               };
             };
             boot = {
-              priority = 3;
+              priority = 30;
               size = "128M";
               content = {
                 type = "luks";
@@ -85,7 +91,7 @@ in
               };
             };
             main = {
-              priority = 4;
+              priority = 40;
               content = {
                 type = "luks";
                 name = "razmo";
@@ -117,14 +123,14 @@ in
           type = "gpt";
           partitions = {
             swap = {
-              priority = 1;
+              priority = 10;
               start = "2048";
               size = "8G";
               type = "8200"; # Linux swap
               content = {
                 type = "luks";
                 name = "rapswap";
-                initrdUnlock = true;
+                initrdUnlock = false;
                 settings = {
                   keyFile = "/etc/keys/rapswap";
                   allowDiscards = true;
@@ -137,7 +143,7 @@ in
               };
             };
             main = {
-              priority = 2;
+              priority = 20;
               content = {
                 type = "luks";
                 name = "rapido";
@@ -163,16 +169,13 @@ in
                       mountOptions = btrfs_args_ssd;
                     };
                     "home.rapido" = {
-                      mountpoint = "/home.old";
+                      mountpoint = "/mnt/old/home";
                       mountOptions = btrfs_args_ssd;
                     };
                     nix = {
                       mountpoint = "/nix";
                       mountOptions = btrfs_args_ssd;
                     };
-                    nixosboot = {
-                      mountpoint = "/boot";
-                    };
                     nixos = {
                       mountpoint = "/";
                     };
diff --git a/curacao/os.nix b/curacao/os.nix
index 3c110b9..b92c72c 100644
--- a/curacao/os.nix
+++ b/curacao/os.nix
@@ -9,12 +9,7 @@
 
   networking.hostName = "curacao";
   boot = {
-    initrd.secrets = {
-      "/etc/keys/rapido" = "/etc/keys/rapido";
-      "/etc/keys/rapswap" = "/etc/keys/rapswap";
-    };
     loader = {
-      grub.enableCryptodisk = true;
       efi.efiSysMountPoint = "/efi";
     };
   };
diff --git a/hm/desktop.nix b/hm/desktop.nix
index 926e14c..eaf6c20 100644
--- a/hm/desktop.nix
+++ b/hm/desktop.nix
@@ -625,7 +625,6 @@ in
         network = {
           listenAddress = "0.0.0.0"; # So it can be controlled from home
           # TODO ... and whoever is the Wi-Fi network I'm using, which, not great
-          port = 8601; # FIXME Chose a different one for testing, should revert
           startWhenNeeded = true;
         };
         extraConfig = ''