diff --git a/machines/zoidberg/default.nix b/machines/zoidberg/default.nix
index 186eb18..25a1aae 100644
--- a/machines/zoidberg/default.nix
+++ b/machines/zoidberg/default.nix
@@ -42,25 +42,25 @@
   ];
 
   # System wide barrier instance
-  systemd.services.barrier-sddm = {
-    description = "Barrier mouse/keyboard share";
-    requires = [ "display-manager.service" ];
-    after = [ "network.target" "display-manager.service" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      Restart = "always";
-      RestartSec = 10;
-      # todo use user/group
-    };
-    path = with pkgs; [ barrier doas ];
-    script = ''
-      # Wait for file to show up. "display-manager.service" finishes a bit too soon
-      while ! [ -e /run/sddm/* ]; do sleep 1; done;
-      export XAUTHORITY=$(ls /run/sddm/*)
-      # Disable crypto is fine because tailscale is E2E encrypting better than barrier could anyway
-      barrierc -f --disable-crypto --name zoidberg ray.koi-bebop.ts.net
-    '';
-  };
+  # systemd.services.barrier-sddm = {
+  #   description = "Barrier mouse/keyboard share";
+  #   requires = [ "display-manager.service" ];
+  #   after = [ "network.target" "display-manager.service" ];
+  #   wantedBy = [ "multi-user.target" ];
+  #   serviceConfig = {
+  #     Restart = "always";
+  #     RestartSec = 10;
+  #     # todo use user/group
+  #   };
+  #   path = with pkgs; [ barrier doas ];
+  #   script = ''
+  #     # Wait for file to show up. "display-manager.service" finishes a bit too soon
+  #     while ! [ -e /run/sddm/* ]; do sleep 1; done;
+  #     export XAUTHORITY=$(ls /run/sddm/*)
+  #     # Disable crypto is fine because tailscale is E2E encrypting better than barrier could anyway
+  #     barrierc -f --disable-crypto --name zoidberg ray.koi-bebop.ts.net
+  #   '';
+  # };
 
   # Login into X11 plasma so barrier works well
   services.displayManager.defaultSession = "plasma";
diff --git a/machines/zoidberg/hardware-configuration.nix b/machines/zoidberg/hardware-configuration.nix
index 2c69ccc..507abb2 100644
--- a/machines/zoidberg/hardware-configuration.nix
+++ b/machines/zoidberg/hardware-configuration.nix
@@ -7,7 +7,7 @@
     ];
 
   # boot
-  efi.enable = true;
+  boot.loader.systemd-boot.enable = true;
   boot.loader.timeout = lib.mkForce 15;
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
@@ -35,7 +35,7 @@
     };
   fileSystems."/boot" =
     {
-      device = "/dev/disk/by-uuid/8074-B04D";
+      device = "/dev/disk/by-uuid/954B-AB3E";
       fsType = "vfat";
     };
   swapDevices =