diff --git a/configurations/dropbox.nix b/configurations/dropbox.nix
index 0905bbe4..d342bfb7 100644
--- a/configurations/dropbox.nix
+++ b/configurations/dropbox.nix
@@ -2,7 +2,7 @@
 
 {
   custom.zfs.homeLinks = [
-    { path = ".dropbox"; type = "data"; }
+    { path = ".dropbox"; type = "cache"; }
     { path = "Dropbox"; type = "data"; }
   ];
   home-manager.users.charlotte = { pkgs, ... }: {
diff --git a/imports/nixos-hardware/default.nix b/imports/nixos-hardware/default.nix
deleted file mode 100644
index 961783d0..00000000
--- a/imports/nixos-hardware/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-let
-  metadata = import ./metadata.nix;
-in
-builtins.fetchTarball {
-  url = "https://github.com/NixOS/nixos-hardware/archive/${metadata.rev}.tar.gz";
-  sha256 = metadata.sha256;
-}
diff --git a/imports/nixos-hardware/metadata.nix b/imports/nixos-hardware/metadata.nix
deleted file mode 100644
index df47690f..00000000
--- a/imports/nixos-hardware/metadata.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  url = "https://github.com/NixOS/nixos-hardware/archive/master.tar.gz";
-  repo_git = "https://github.com/NixOS/nixos-hardware";
-  branch = "master";
-  rev = "cc353d439e3135dbe3f5473d897d2c35537f260c";
-  sha256 = "1vwjdbl7x5nx3i6x4xqqsbfwm5kby4qskr1yrx5sv849560ag4dm";
-  revdate = "2020-07-06 16:22:31 +0100";
-  skip = false;
-}
diff --git a/imports/nixpkgs/metadata.nix b/imports/nixpkgs/metadata.nix
index df8b5915..aaaf11cf 100644
--- a/imports/nixpkgs/metadata.nix
+++ b/imports/nixpkgs/metadata.nix
@@ -2,8 +2,8 @@
   url = "https://github.com/charvp/nixpkgs/archive/master.tar.gz";
   repo_git = "https://github.com/charvp/nixpkgs";
   branch = "master";
-  rev = "0a76d3a9b33ab414a8719a1a9d6a4aa7eb09a999";
-  sha256 = "0q7hvlf3p1say0j8jw4wzq6w27p3k4xbklcchx08wahvp41lgmix";
-  revdate = "2020-07-10 09:47:22 +0200";
+  rev = "901695dcaa0c0143def8ad5ad75834e3a5bcc478";
+  sha256 = "1w26a7c0yhxv8qa1msylbq3qifxramrnsgdaplyjy5sbs61i95hr";
+  revdate = "2020-07-11 13:04:15 +0200";
   skip = false;
 }
diff --git a/machines/oldtown/configuration.nix b/machines/kharbranth/configuration.nix
similarity index 71%
rename from machines/oldtown/configuration.nix
rename to machines/kharbranth/configuration.nix
index 4837a2e0..1a49270e 100644
--- a/machines/oldtown/configuration.nix
+++ b/machines/kharbranth/configuration.nix
@@ -1,14 +1,7 @@
 { config, pkgs, ... }:
 
-let
-  findImport = (import ../../lib.nix).findImport;
-  nixos-hardware = findImport "nixos-hardware";
-in
 {
   imports = [
-    "${nixos-hardware}/common/cpu/intel"
-    "${nixos-hardware}/common/pc/laptop"
-    "${nixos-hardware}/common/pc/laptop/ssd"
     ./hardware.nix
     ./secret.nix
     ../../configurations/eid.nix
@@ -17,7 +10,10 @@ in
     ../../profiles/graphical.nix
   ];
 
-  networking.hostName = "oldtown";
+  networking = {
+    hostId = "e718389d";
+    hostName = "kharbranth";
+  };
 
   time.timeZone = "Europe/Brussels";
 
@@ -27,14 +23,18 @@ in
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "20.03";
+  system.stateVersion = "20.09";
 
   home-manager.users.charlotte = { ... }: {
-    home.stateVersion = "20.03";
+    home.stateVersion = "20.09";
   };
 
   # Machine-specific application settings
   custom = {
     git.email = "charlotte.vanpetegem@ugent.be";
+    zfs = {
+      enable = true;
+      encrypted = true;
+    };
   };
 }
diff --git a/machines/oldtown/default.nix b/machines/kharbranth/default.nix
similarity index 100%
rename from machines/oldtown/default.nix
rename to machines/kharbranth/default.nix
diff --git a/machines/kharbranth/hardware.nix b/machines/kharbranth/hardware.nix
new file mode 100644
index 00000000..f67d9b3c
--- /dev/null
+++ b/machines/kharbranth/hardware.nix
@@ -0,0 +1,56 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot = {
+    # Use the systemd-boot EFI boot loader.
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+      kernelModules = [ "i915" ];
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems."/" = {
+    device = "rpool/local/root";
+    fsType = "zfs";
+  };
+
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };
+
+  fileSystems."/nix/store" = {
+    device = "rpool/local/nix-store";
+    fsType = "zfs";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/A5BA-352A";
+    fsType = "vfat";
+  };
+
+  fileSystems."/cache" = {
+    device = "rpool/local/cache";
+    fsType = "zfs";
+  };
+
+  fileSystems."/data" = {
+    device = "rpool/safe/data";
+    fsType = "zfs";
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/1de27da4-5e97-4104-ab2b-18ab14a2b90b"; }
+  ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = true;
+}
diff --git a/machines/kharbranth/secret.nix b/machines/kharbranth/secret.nix
new file mode 100644
index 00000000..6a77511d
Binary files /dev/null and b/machines/kharbranth/secret.nix differ
diff --git a/machines/kholinar/configuration.nix b/machines/kholinar/configuration.nix
index 96f9d5af..0ba8bda9 100644
--- a/machines/kholinar/configuration.nix
+++ b/machines/kholinar/configuration.nix
@@ -1,12 +1,7 @@
 { pkgs, lib, ... }:
 
-let
-  findImport = (import ../../lib.nix).findImport;
-  nixos-hardware = findImport "nixos-hardware";
-in
 {
   imports = [
-    "${nixos-hardware}/lenovo/thinkpad/t490"
     ./hardware.nix
     ./secret.nix
     ../../configurations/eid.nix
diff --git a/machines/kholinar/hardware.nix b/machines/kholinar/hardware.nix
index a417d9ef..38c502a1 100644
--- a/machines/kholinar/hardware.nix
+++ b/machines/kholinar/hardware.nix
@@ -48,7 +48,6 @@
     { device = "/dev/disk/by-uuid/6c09b90f-8971-4702-a18a-f06dfb3d8dcd"; }
   ];
 
-  nix.maxJobs = lib.mkDefault 8;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = true;
 }
diff --git a/machines/oldtown/hardware.nix b/machines/oldtown/hardware.nix
deleted file mode 100644
index 31999a5d..00000000
--- a/machines/oldtown/hardware.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    initrd = {
-      availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-      kernelModules = [ "i915" ];
-    };
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
-  };
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/e4b7eae2-546d-412b-9258-389315f4b835";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/A4C4-7B9F";
-    fsType = "vfat";
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/72c82e3c-ea61-488b-8b24-b3c27368a2ba"; }
-  ];
-
-  nix.maxJobs = lib.mkDefault 8;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = true;
-}
diff --git a/machines/oldtown/secret.nix b/machines/oldtown/secret.nix
deleted file mode 100644
index 72ae63a4..00000000
Binary files a/machines/oldtown/secret.nix and /dev/null differ
diff --git a/packages/kotlin-language-server/default.nix b/packages/kotlin-language-server/default.nix
index b6290026..fe8bfebd 100644
--- a/packages/kotlin-language-server/default.nix
+++ b/packages/kotlin-language-server/default.nix
@@ -8,7 +8,7 @@ buildGradle {
   envSpec = ./gradle-env.json;
   src = fetchTarball {
     url = "https://github.com/fwcd/kotlin-language-server/archive/master.tar.gz";
-    sha256 = "16qddjwcj1n79c4p9dqlj1vg6yg5rkvzb8r15jbyxsy82mp6ib3k";
+    sha256 = "0by07h2ly84dzmwzjf3fsgghm3fwhyhhbnnv3kl7dy1iajhl4shj";
   };
   gradleFlags = [ "server:installDist" ];
   installPhase = ''