diff --git a/flake.nix b/flake.nix
index 5eaaaec1..280795dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,6 +82,7 @@
         system = "x86_64-linux";
         specialArgs = {inherit inputs;};
         modules = [
+          disko.nixosModules.disko
           nixos-hardware.nixosModules.framework-13-7040-amd
           home-manager.nixosModules.home-manager
           ./hosts/lavaridge
diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix
index 1e3fe804..a15c294b 100644
--- a/hosts/lavaridge/default.nix
+++ b/hosts/lavaridge/default.nix
@@ -9,6 +9,7 @@
   imports = [
     ./hardware-configuration.nix # Include the results of the hardware scan.
     ./home.nix
+    ./disko.nix
   ];
 
   boot = {
diff --git a/hosts/lavaridge/hardware-configuration.nix b/hosts/lavaridge/hardware-configuration.nix
index c04c68c2..34e628a3 100644
--- a/hosts/lavaridge/hardware-configuration.nix
+++ b/hosts/lavaridge/hardware-configuration.nix
@@ -15,18 +15,6 @@
   boot.kernelModules = ["kvm-amd" "amd-gpu"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/2a76d315-37f9-406d-b1b2-01fee209139a";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/7BC8-F615";
-    fsType = "vfat";
-  };
-
-  swapDevices = [];
-
   hardware.opengl = {
     ## radv: an open-source Vulkan driver from freedesktop
     driSupport = true;