diff --git a/curacao/hardware.nix b/curacao/hardware.nix
index b7e23b5..996cf10 100644
--- a/curacao/hardware.nix
+++ b/curacao/hardware.nix
@@ -1,8 +1,15 @@
 { lib, ... }:
 {
   imports = [
-    "${builtins.fetchTarball "https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz"}/dell/g3/3779"
+    <nixos-hardware/dell/g3/3779>
   ];
 
-  boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
+  # UEFI works here, and variables can be touched
+  boot.loader = {
+    efi.canTouchEfiVariables = lib.mkDefault true;
+    grub = {
+      enable = true;
+      efiSupport = true;
+    };
+  };
 }
diff --git a/curacao_usb/os.nix b/curacao_usb/os.nix
index 702f872..32b2211 100644
--- a/curacao_usb/os.nix
+++ b/curacao_usb/os.nix
@@ -1,30 +1,22 @@
 { pkgs, config, ... }:
 {
-  # This whole folder is DEBUG
   imports = [
-    "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22.tar.gz"}/module.nix"
+    ../os
+    ../curacao/options.nix
+    ../curacao/hardware.nix
     ./disko.nix
   ];
 
-  nixpkgs.config.allowUnfree = true;
   networking.hostName = "curacao_usb";
 
-  boot = {
-    # nixos-hardware use latest kernel by default. It has been set a while ago, we maybe don't need it anymore?
-    kernelPackages = pkgs.linuxPackages;
-
-    # Pinebook supports UEFI, at least when tow-boot is installed on the SPI
-    loader = {
-      # EFI Variables don't work (no generation appears in systemd-boot)
-      efi.canTouchEfiVariables = false;
-
-      # systemd-boot crashes after booting, so GRUB it is
-      grub = {
-        enable = true;
-        efiSupport = true;
-        efiInstallAsRemovable = true;
-        device = "nodev";
-      };
+  # It's a removable drive, so no touching EFI vars
+  # (quite a lot of stuff to set for that!)
+  boot.loader = {
+    efi.canTouchEfiVariables = false;
+    grub = {
+      efiInstallAsRemovable = true;
+      device = "nodev";
     };
   };
+
 }
diff --git a/pindakaas/hardware.nix b/pindakaas/hardware.nix
index d91bb76..3fd9443 100644
--- a/pindakaas/hardware.nix
+++ b/pindakaas/hardware.nix
@@ -1,8 +1,7 @@
 { pkgs, config, ... }:
 {
   imports = [
-    # First commit before 23.05 release date:
-    "${builtins.fetchTarball "https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz"}/pine64/pinebook-pro"
+    <nixos-hardware/pine64/pinebook-pro>
   ];
 
   boot = {
@@ -10,6 +9,7 @@
     kernelPackages = pkgs.linuxPackages;
 
     # Otherwise it will not show stage1 echo and prompt
+    # UPST
     kernelParams = ["console=tty0"];
 
     # Pinebook supports UEFI, at least when tow-boot is installed on the SPI