diff --git a/hosts/x1g13/disko.nix b/hosts/x1g13/disko.nix
index 8f7c1f7..6569d4c 100644
--- a/hosts/x1g13/disko.nix
+++ b/hosts/x1g13/disko.nix
@@ -12,6 +12,8 @@ let
   ];
 in
 {
+  disko.enableConfig = true;
+
   disko.devices.disk = {
     esp = {
       type = "disk";
diff --git a/hosts/x1g13/hardware-configuration.nix b/hosts/x1g13/hardware-configuration.nix
index c1a912d..775079e 100644
--- a/hosts/x1g13/hardware-configuration.nix
+++ b/hosts/x1g13/hardware-configuration.nix
@@ -24,28 +24,9 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/29b4b68d-c25e-48b1-beb3-30f63ac2f491";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/EA69-77EE";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
-    ];
-  };
-
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/modules/system/disko.nix b/modules/system/disko.nix
index 29bc2b4..ccec8f5 100644
--- a/modules/system/disko.nix
+++ b/modules/system/disko.nix
@@ -1,10 +1,10 @@
-{ inputs, ... }:
+{ inputs, lib, ... }:
 {
   imports = [
     inputs.disko.nixosModules.disko
   ];
 
   config = {
-    disko.enableConfig = true;
+    disko.enableConfig = lib.mkDefault false;
   };
 }