diff --git a/apple/imac/18-2/default.nix b/apple/imac/18-2/default.nix
index 4770e10b..9d71ba32 100644
--- a/apple/imac/18-2/default.nix
+++ b/apple/imac/18-2/default.nix
@@ -9,7 +9,7 @@
     ../../../common/cpu/intel/kaby-lake
     ../../../common/gpu/amd
     ../../../common/hidpi.nix
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # apple smc (TODO: check spi)
diff --git a/apple/imac/default.nix b/apple/imac/default.nix
index ea15175d..86d48299 100644
--- a/apple/imac/default.nix
+++ b/apple/imac/default.nix
@@ -3,6 +3,6 @@
     ../.
     ../../common/cpu/intel
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
   ];
 }
diff --git a/apple/macbook-air/default.nix b/apple/macbook-air/default.nix
index ea15175d..86d48299 100644
--- a/apple/macbook-air/default.nix
+++ b/apple/macbook-air/default.nix
@@ -3,6 +3,6 @@
     ../.
     ../../common/cpu/intel
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
   ];
 }
diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix
index 08302289..8967b1cb 100644
--- a/apple/macbook-pro/10-1/default.nix
+++ b/apple/macbook-pro/10-1/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/gpu/24.05-compat.nix
     ../../../common/gpu/nvidia/kepler
   ];
diff --git a/apple/macbook-pro/11-1/default.nix b/apple/macbook-pro/11-1/default.nix
index 17525084..6c9509b2 100644
--- a/apple/macbook-pro/11-1/default.nix
+++ b/apple/macbook-pro/11-1/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/cpu/intel/haswell
   ];
 
diff --git a/apple/macbook-pro/11-5/default.nix b/apple/macbook-pro/11-5/default.nix
index 81eda9b2..1db2878f 100644
--- a/apple/macbook-pro/11-5/default.nix
+++ b/apple/macbook-pro/11-5/default.nix
@@ -9,7 +9,7 @@ in
 {
   imports = [
     ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Enable broadcom-43xx firmware
diff --git a/apple/macbook-pro/12-1/default.nix b/apple/macbook-pro/12-1/default.nix
index 7497b2ff..6f1bc995 100644
--- a/apple/macbook-pro/12-1/default.nix
+++ b/apple/macbook-pro/12-1/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     "${modulesPath}/hardware/network/broadcom-43xx.nix"
   ];
 
diff --git a/apple/macbook-pro/14-1/default.nix b/apple/macbook-pro/14-1/default.nix
index cec9e262..e7897708 100644
--- a/apple/macbook-pro/14-1/default.nix
+++ b/apple/macbook-pro/14-1/default.nix
@@ -8,7 +8,7 @@
     ../.
     ../../../common/cpu/intel/kaby-lake
     ../../../common/hidpi.nix
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Make the keyboard work in stage1, enable iommu
diff --git a/apple/macbook-pro/8-1/default.nix b/apple/macbook-pro/8-1/default.nix
index bc77ea6a..a807da27 100644
--- a/apple/macbook-pro/8-1/default.nix
+++ b/apple/macbook-pro/8-1/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../.
     ../../../common/cpu/intel/sandy-bridge
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   networking.enableB43Firmware = lib.mkDefault true;
diff --git a/asus/ally/rc71l/default.nix b/asus/ally/rc71l/default.nix
index 9cc83fed..7f2552ec 100644
--- a/asus/ally/rc71l/default.nix
+++ b/asus/ally/rc71l/default.nix
@@ -5,7 +5,7 @@
     ../../../common/cpu/amd/pstate.nix
     ../../../common/gpu/amd
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../battery.nix
   ];
 
diff --git a/asus/fa506ic/default.nix b/asus/fa506ic/default.nix
index 10d08fbc..c9591fd7 100644
--- a/asus/fa506ic/default.nix
+++ b/asus/fa506ic/default.nix
@@ -8,7 +8,7 @@
     ../../common/gpu/nvidia/prime.nix
     ../../common/gpu/nvidia/ampere
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
   ];
 
   hardware.nvidia = {
diff --git a/asus/zenbook/ux371/default.nix b/asus/zenbook/ux371/default.nix
index 8e387c0c..1b4b7f26 100644
--- a/asus/zenbook/ux371/default.nix
+++ b/asus/zenbook/ux371/default.nix
@@ -7,7 +7,7 @@
   imports = [
     ../../../common/cpu/intel/tiger-lake
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../battery.nix
   ];
 
diff --git a/asus/zenbook/ux481/shared.nix b/asus/zenbook/ux481/shared.nix
index f23d5e17..a9842c7d 100644
--- a/asus/zenbook/ux481/shared.nix
+++ b/asus/zenbook/ux481/shared.nix
@@ -7,12 +7,12 @@
   imports = [
     ../../../common/cpu/intel/comet-lake/cpu-only.nix
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../battery.nix
   ];
 
-  boot.kernelParams = [ 
-    # These options are needed for suspend to work, 
+  boot.kernelParams = [
+    # These options are needed for suspend to work,
     # otherwise the nvme will be mounted read-only on resume
     "pcie_aspm=off"
     "pcie_port_pm=off"
diff --git a/asus/zenbook/ux535/default.nix b/asus/zenbook/ux535/default.nix
index a6df788d..f2b3da6e 100644
--- a/asus/zenbook/ux535/default.nix
+++ b/asus/zenbook/ux535/default.nix
@@ -8,7 +8,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/cpu/intel
     ../../../common/gpu/intel/comet-lake
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/hidpi.nix # 4K screen is HiDPI
     ../../battery.nix
   ];
diff --git a/asus/zephyrus/ga401/default.nix b/asus/zephyrus/ga401/default.nix
index 9dad2c17..f7469f1c 100644
--- a/asus/zephyrus/ga401/default.nix
+++ b/asus/zephyrus/ga401/default.nix
@@ -8,7 +8,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/ampere
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   hardware.nvidia = {
diff --git a/asus/zephyrus/ga402/default.nix b/asus/zephyrus/ga402/default.nix
index 2002fd09..e38e52e5 100644
--- a/asus/zephyrus/ga402/default.nix
+++ b/asus/zephyrus/ga402/default.nix
@@ -6,7 +6,7 @@
     ../../../common/cpu/amd/pstate.nix
     ../../../common/gpu/amd
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   services = {
diff --git a/asus/zephyrus/gu605my/default.nix b/asus/zephyrus/gu605my/default.nix
index d1ce68bb..3ccbdbfd 100644
--- a/asus/zephyrus/gu605my/default.nix
+++ b/asus/zephyrus/gu605my/default.nix
@@ -6,7 +6,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/ada-lovelace
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../shared/backlight.nix
   ];
 
diff --git a/chuwi/minibook-x/default.nix b/chuwi/minibook-x/default.nix
index 39bc9ccc..0b78d046 100644
--- a/chuwi/minibook-x/default.nix
+++ b/chuwi/minibook-x/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../../common/cpu/intel
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
     ../../common/hidpi.nix
   ];
   # Fixes the display being rotated 90 degrees.
diff --git a/common/pc/laptop/ssd b/common/pc/laptop/ssd
deleted file mode 120000
index e313834a..00000000
--- a/common/pc/laptop/ssd
+++ /dev/null
@@ -1 +0,0 @@
-../ssd
\ No newline at end of file
diff --git a/dell/g3/3579/default.nix b/dell/g3/3579/default.nix
index e5246c4c..9b74d522 100644
--- a/dell/g3/3579/default.nix
+++ b/dell/g3/3579/default.nix
@@ -6,7 +6,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/pascal
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Specify bus id of Nvidia and Intel graphics
diff --git a/dell/g3/3779/default.nix b/dell/g3/3779/default.nix
index c9afd482..4e345a02 100644
--- a/dell/g3/3779/default.nix
+++ b/dell/g3/3779/default.nix
@@ -6,7 +6,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/pascal
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Specify bus id of Nvidia and Intel graphics
diff --git a/dell/inspiron/7405/default.nix b/dell/inspiron/7405/default.nix
index 06ccf92f..d894e179 100644
--- a/dell/inspiron/7405/default.nix
+++ b/dell/inspiron/7405/default.nix
@@ -7,7 +7,7 @@ with lib;
     ../../../common/cpu/amd
     ../../../common/gpu/amd
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # TSC is unstable
diff --git a/dell/inspiron/7460/default.nix b/dell/inspiron/7460/default.nix
index 5a268970..aacbacaa 100644
--- a/dell/inspiron/7460/default.nix
+++ b/dell/inspiron/7460/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/gpu/intel/kaby-lake
     ../../../common/gpu/nvidia/maxwell
     ../../../common/gpu/nvidia/prime.nix
diff --git a/dell/inspiron/7559/README.md b/dell/inspiron/7559/README.md
index a1bb0427..6a4b2033 100644
--- a/dell/inspiron/7559/README.md
+++ b/dell/inspiron/7559/README.md
@@ -41,7 +41,7 @@ This configuration uses Nvidia Prime offloading, which allows use of the `nvidia
 
 #### SSD
 
-This laptop has an optional M.2 SSD slot, which isn't accounted for here. If you are using the SSD, you could look into implementing the options in [ssd](common/pc/laptop/ssd) manually. Some sources also say you should ensure your SATA Mode is set to AHCI in your BIOS for it to be detected, however I think this is a prerequisite to installing Linux on this laptop in the first place so you probably already have that set.
+This laptop has an optional M.2 SSD slot, which isn't accounted for here. If you are using the SSD, you could look into implementing the options in [ssd](common/pc/ssd) manually. Some sources also say you should ensure your SATA Mode is set to AHCI in your BIOS for it to be detected, however I think this is a prerequisite to installing Linux on this laptop in the first place so you probably already have that set.
 
 #### Subwoofer
 
diff --git a/dell/latitude/3340/default.nix b/dell/latitude/3340/default.nix
index d50b024c..dda36a88 100644
--- a/dell/latitude/3340/default.nix
+++ b/dell/latitude/3340/default.nix
@@ -4,6 +4,6 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 }
diff --git a/dell/latitude/3480/default.nix b/dell/latitude/3480/default.nix
index 0b16e0aa..e54673cb 100644
--- a/dell/latitude/3480/default.nix
+++ b/dell/latitude/3480/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # touchpad goes over i2c
diff --git a/dell/latitude/5490/default.nix b/dell/latitude/5490/default.nix
index ee99f414..2cde4ad0 100644
--- a/dell/latitude/5490/default.nix
+++ b/dell/latitude/5490/default.nix
@@ -4,12 +4,12 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Important Firmware
   hardware.enableRedistributableFirmware = lib.mkDefault true;
-  
+
   boot = {
     # Kernel Panic on suspend fix, taken from ArchLinux wiki.
     kernelParams = [ "acpi_enforce_resources=lax" "i915.enable_dc=0" ];
diff --git a/dell/latitude/5520/default.nix b/dell/latitude/5520/default.nix
index 6ad43309..b72a1830 100644
--- a/dell/latitude/5520/default.nix
+++ b/dell/latitude/5520/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Essential Firmware
diff --git a/dell/latitude/7280/default.nix b/dell/latitude/7280/default.nix
index 3b57a289..c98daed5 100644
--- a/dell/latitude/7280/default.nix
+++ b/dell/latitude/7280/default.nix
@@ -4,6 +4,6 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 }
diff --git a/dell/latitude/7420/default.nix b/dell/latitude/7420/default.nix
index a100101a..7e1f49f1 100644
--- a/dell/latitude/7420/default.nix
+++ b/dell/latitude/7420/default.nix
@@ -4,6 +4,6 @@
   imports = [
     ../../../common/cpu/intel/tiger-lake
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 }
diff --git a/dell/latitude/7430/default.nix b/dell/latitude/7430/default.nix
index 7d2f6f98..18f4bb21 100644
--- a/dell/latitude/7430/default.nix
+++ b/dell/latitude/7430/default.nix
@@ -4,16 +4,16 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
-  boot.kernelParams = [ 
+  boot.kernelParams = [
     # needed for Intel Iris Xe
     "i915.force_probe=46a8"
     "i915.enable_guc=3"
     "i915.fastboot=1"
     # needed for keyboard
-    "i8042.dumbkbd=1" 
-    "i8042.nopnp=1" 
+    "i8042.dumbkbd=1"
+    "i8042.nopnp=1"
   ];
 }
diff --git a/dell/latitude/9430/default.nix b/dell/latitude/9430/default.nix
index f652e9ac..0441f53d 100644
--- a/dell/latitude/9430/default.nix
+++ b/dell/latitude/9430/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   boot.kernelParams = [
diff --git a/dell/precision/5530/default.nix b/dell/precision/5530/default.nix
index 84ac324b..1b7007af 100644
--- a/dell/precision/5530/default.nix
+++ b/dell/precision/5530/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/gpu/nvidia/pascal
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/cpu/intel/coffee-lake
diff --git a/dell/precision/5560/default.nix b/dell/precision/5560/default.nix
index a17ef775..efd227ca 100644
--- a/dell/precision/5560/default.nix
+++ b/dell/precision/5560/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/cpu/intel/tiger-lake
     ../../../common/gpu/nvidia/turing
   ];
diff --git a/dell/precision/7520/default.nix b/dell/precision/7520/default.nix
index 59fa95e6..567aa382 100644
--- a/dell/precision/7520/default.nix
+++ b/dell/precision/7520/default.nix
@@ -6,7 +6,7 @@
   imports = [
     ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/gpu/nvidia
   ];
   hardware.enableRedistributableFirmware = lib.mkDefault true;
diff --git a/dell/xps/13-7390/default.nix b/dell/xps/13-7390/default.nix
index 1f1c4561..c5e8a698 100644
--- a/dell/xps/13-7390/default.nix
+++ b/dell/xps/13-7390/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   boot.kernelParams = [ "mem_sleep_default=deep" ];
diff --git a/dell/xps/13-9343/default.nix b/dell/xps/13-9343/default.nix
index 2904a773..98e0c417 100644
--- a/dell/xps/13-9343/default.nix
+++ b/dell/xps/13-9343/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # This will save you money and possibly your life!
diff --git a/dell/xps/13-9350/default.nix b/dell/xps/13-9350/default.nix
index 8ee58b2c..2157e642 100644
--- a/dell/xps/13-9350/default.nix
+++ b/dell/xps/13-9350/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../../common/cpu/intel/lunar-lake
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # The touchpad uses I²C, so PS/2 is unnecessary
diff --git a/dell/xps/15-9500/default.nix b/dell/xps/15-9500/default.nix
index 7d346a27..b11ecd16 100644
--- a/dell/xps/15-9500/default.nix
+++ b/dell/xps/15-9500/default.nix
@@ -6,7 +6,7 @@ in
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Boot loader
@@ -18,7 +18,7 @@ in
   # Thermald doesn't have a default config for the 9500 yet, the one in this repo
   # was generated with dptfxtract-static (https://github.com/intel/dptfxtract)
   services.thermald.configFile = lib.mkDefault thermald-conf;
-  
+
   # WiFi speed is slow and crashes by default (https://bugzilla.kernel.org/show_bug.cgi?id=213381)
   # disable_11ax - required until ax driver support is fixed
   # power_save - works well on this card
diff --git a/dell/xps/15-9510/default.nix b/dell/xps/15-9510/default.nix
index 066039c6..12a64450 100644
--- a/dell/xps/15-9510/default.nix
+++ b/dell/xps/15-9510/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # This will save you money and possibly your life!
diff --git a/dell/xps/15-9520/default.nix b/dell/xps/15-9520/default.nix
index 19205454..b30eee31 100644
--- a/dell/xps/15-9520/default.nix
+++ b/dell/xps/15-9520/default.nix
@@ -4,7 +4,7 @@
     ../../../common/cpu/intel
     ../../../common/gpu/intel/alder-lake
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # This will save you money and possibly your life!
diff --git a/dell/xps/15-9530/default.nix b/dell/xps/15-9530/default.nix
index 95df2da6..99fd8a71 100644
--- a/dell/xps/15-9530/default.nix
+++ b/dell/xps/15-9530/default.nix
@@ -3,7 +3,7 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # This will save you money and possibly your life!
diff --git a/focus/m2/gen1/default.nix b/focus/m2/gen1/default.nix
index f9242900..2b8e5e7c 100644
--- a/focus/m2/gen1/default.nix
+++ b/focus/m2/gen1/default.nix
@@ -6,7 +6,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/turing
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
diff --git a/framework/13-inch/common/default.nix b/framework/13-inch/common/default.nix
index 4e6f519a..d42a9f72 100644
--- a/framework/13-inch/common/default.nix
+++ b/framework/13-inch/common/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../bluetooth.nix
     ../../kmod.nix
     ../../framework-tool.nix
diff --git a/framework/16-inch/common/default.nix b/framework/16-inch/common/default.nix
index 0b803063..8443e401 100644
--- a/framework/16-inch/common/default.nix
+++ b/framework/16-inch/common/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../bluetooth.nix
     ../../kmod.nix
     ../../framework-tool.nix
diff --git a/google/pixelbook/default.nix b/google/pixelbook/default.nix
index 1ea4c7af..6ad1d2cc 100644
--- a/google/pixelbook/default.nix
+++ b/google/pixelbook/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
     ../../common/cpu/intel/kaby-lake
   ];
 }
diff --git a/gpd/micropc/default.nix b/gpd/micropc/default.nix
index d9a699ef..34b35201 100644
--- a/gpd/micropc/default.nix
+++ b/gpd/micropc/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
   ];
 
   # Needed to have the keyboard working during the initrd sequence
diff --git a/gpd/p2-max/default.nix b/gpd/p2-max/default.nix
index e8f183e2..206348c4 100644
--- a/gpd/p2-max/default.nix
+++ b/gpd/p2-max/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
     ../../common/cpu/intel/kaby-lake
     ../../common/hidpi.nix
   ];
diff --git a/gpd/pocket-3/default.nix b/gpd/pocket-3/default.nix
index 621f4454..a271a644 100644
--- a/gpd/pocket-3/default.nix
+++ b/gpd/pocket-3/default.nix
@@ -4,7 +4,7 @@ in
 {
 	imports = [
 		../../common/pc/laptop
-		../../common/pc/laptop/ssd
+		../../common/pc/ssd
     ../../common/hidpi.nix
     ../../common/gpu/24.05-compat.nix
 	];
diff --git a/gpd/pocket-4/default.nix b/gpd/pocket-4/default.nix
index 36a6a0a7..4ec54b63 100644
--- a/gpd/pocket-4/default.nix
+++ b/gpd/pocket-4/default.nix
@@ -4,7 +4,7 @@ in
 {
   imports = [
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
     ../../common/cpu/amd
     ../../common/cpu/amd/pstate.nix
     ../../common/gpu/amd
diff --git a/hp/elitebook/830/g6/default.nix b/hp/elitebook/830/g6/default.nix
index 9e62264f..1790c8a9 100644
--- a/hp/elitebook/830/g6/default.nix
+++ b/hp/elitebook/830/g6/default.nix
@@ -3,7 +3,7 @@
   imports = [
     ../../../../common/cpu/intel
     ../../../../common/pc/laptop
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   # Needed for wifi
diff --git a/hp/elitebook/845/g7/default.nix b/hp/elitebook/845/g7/default.nix
index 823bf40c..d18ef3cf 100644
--- a/hp/elitebook/845/g7/default.nix
+++ b/hp/elitebook/845/g7/default.nix
@@ -7,7 +7,7 @@
       ../../../../common/cpu/amd/pstate.nix
       ../../../../common/gpu/amd
       ../../../../common/pc/laptop
-      ../../../../common/pc/laptop/ssd
+      ../../../../common/pc/ssd
     ];
 
   hardware.enableRedistributableFirmware = lib.mkDefault true;
diff --git a/hp/elitebook/845/g8/default.nix b/hp/elitebook/845/g8/default.nix
index 823bf40c..d18ef3cf 100644
--- a/hp/elitebook/845/g8/default.nix
+++ b/hp/elitebook/845/g8/default.nix
@@ -7,7 +7,7 @@
       ../../../../common/cpu/amd/pstate.nix
       ../../../../common/gpu/amd
       ../../../../common/pc/laptop
-      ../../../../common/pc/laptop/ssd
+      ../../../../common/pc/ssd
     ];
 
   hardware.enableRedistributableFirmware = lib.mkDefault true;
diff --git a/hp/elitebook/845/g9/default.nix b/hp/elitebook/845/g9/default.nix
index 823bf40c..d18ef3cf 100644
--- a/hp/elitebook/845/g9/default.nix
+++ b/hp/elitebook/845/g9/default.nix
@@ -7,7 +7,7 @@
       ../../../../common/cpu/amd/pstate.nix
       ../../../../common/gpu/amd
       ../../../../common/pc/laptop
-      ../../../../common/pc/laptop/ssd
+      ../../../../common/pc/ssd
     ];
 
   hardware.enableRedistributableFirmware = lib.mkDefault true;
diff --git a/hp/laptop/14s-dq2024nf/default.nix b/hp/laptop/14s-dq2024nf/default.nix
index acad2f55..f7a1a654 100644
--- a/hp/laptop/14s-dq2024nf/default.nix
+++ b/hp/laptop/14s-dq2024nf/default.nix
@@ -5,7 +5,7 @@
     ../../../common/cpu/intel/tiger-lake
     ../../../common/pc
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   config = {
diff --git a/hp/probook/440G5/default.nix b/hp/probook/440G5/default.nix
index 7cc5a234..9bc0fc82 100644
--- a/hp/probook/440G5/default.nix
+++ b/hp/probook/440G5/default.nix
@@ -7,7 +7,7 @@
     ../../../common/cpu/intel/kaby-lake
     ../../../common/pc
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   config = {
diff --git a/lenovo/ideapad/15ach6/default.nix b/lenovo/ideapad/15ach6/default.nix
index e86fee90..35527a01 100644
--- a/lenovo/ideapad/15ach6/default.nix
+++ b/lenovo/ideapad/15ach6/default.nix
@@ -8,7 +8,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/turing
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   hardware.nvidia = {
diff --git a/lenovo/ideapad/15alc6/default.nix b/lenovo/ideapad/15alc6/default.nix
index 386f2720..31a8b390 100644
--- a/lenovo/ideapad/15alc6/default.nix
+++ b/lenovo/ideapad/15alc6/default.nix
@@ -5,6 +5,6 @@
     ../../../common/cpu/amd
     ../../../common/gpu/amd
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 }
diff --git a/lenovo/ideapad/15arh05/default.nix b/lenovo/ideapad/15arh05/default.nix
index f021a2d6..a4ff8df1 100644
--- a/lenovo/ideapad/15arh05/default.nix
+++ b/lenovo/ideapad/15arh05/default.nix
@@ -6,7 +6,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/turing
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Specify bus id of Nvidia and Intel graphics.
diff --git a/lenovo/ideapad/16ach6/default.nix b/lenovo/ideapad/16ach6/default.nix
index aeec3298..246b35ea 100644
--- a/lenovo/ideapad/16ach6/default.nix
+++ b/lenovo/ideapad/16ach6/default.nix
@@ -8,7 +8,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/turing
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   hardware.nvidia = {
diff --git a/lenovo/ideapad/16ahp9/default.nix b/lenovo/ideapad/16ahp9/default.nix
index f83290e2..5a6acd06 100644
--- a/lenovo/ideapad/16ahp9/default.nix
+++ b/lenovo/ideapad/16ahp9/default.nix
@@ -6,6 +6,6 @@
     ../../../common/cpu/amd/pstate.nix
     ../../../common/gpu/amd
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 }
diff --git a/lenovo/ideapad/16iah8/default.nix b/lenovo/ideapad/16iah8/default.nix
index 1f71aed2..ee899fc5 100644
--- a/lenovo/ideapad/16iah8/default.nix
+++ b/lenovo/ideapad/16iah8/default.nix
@@ -4,6 +4,6 @@
   imports = [
     ../../../common/cpu/intel/alder-lake
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 }
diff --git a/lenovo/ideapad/slim-5/default.nix b/lenovo/ideapad/slim-5/default.nix
index 02173bd4..202d2c85 100644
--- a/lenovo/ideapad/slim-5/default.nix
+++ b/lenovo/ideapad/slim-5/default.nix
@@ -3,6 +3,6 @@
     ../../../common/cpu/amd
     ../../../common/gpu/amd
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 }
diff --git a/lenovo/legion/15ach6/default.nix b/lenovo/legion/15ach6/default.nix
index 0166a5fe..6c890105 100644
--- a/lenovo/legion/15ach6/default.nix
+++ b/lenovo/legion/15ach6/default.nix
@@ -7,7 +7,7 @@
     ../../../common/gpu/nvidia/ampere
     ../../../common/hidpi.nix
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   hardware.nvidia.prime = {
diff --git a/lenovo/legion/15ach6h/hybrid/default.nix b/lenovo/legion/15ach6h/hybrid/default.nix
index 044d088b..7fa179ce 100644
--- a/lenovo/legion/15ach6h/hybrid/default.nix
+++ b/lenovo/legion/15ach6h/hybrid/default.nix
@@ -8,7 +8,7 @@
     ../../../../common/gpu/nvidia/prime.nix
     ../../../../common/gpu/nvidia/ampere
     ../../../../common/pc/laptop
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   # Still needs to load at some point if we want X11 to work
diff --git a/lenovo/legion/15arh05h/default.nix b/lenovo/legion/15arh05h/default.nix
index bfff924a..554ad8ff 100644
--- a/lenovo/legion/15arh05h/default.nix
+++ b/lenovo/legion/15arh05h/default.nix
@@ -6,7 +6,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/turing
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Specify bus id of Nvidia and Intel graphics.
diff --git a/lenovo/legion/15ich/default.nix b/lenovo/legion/15ich/default.nix
index 8aaffff8..630e1378 100644
--- a/lenovo/legion/15ich/default.nix
+++ b/lenovo/legion/15ich/default.nix
@@ -6,7 +6,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/pascal
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/pc/laptop/hdd
   ];
 
diff --git a/lenovo/legion/16ach6h/hybrid/default.nix b/lenovo/legion/16ach6h/hybrid/default.nix
index 28a68ba1..e987ecd5 100644
--- a/lenovo/legion/16ach6h/hybrid/default.nix
+++ b/lenovo/legion/16ach6h/hybrid/default.nix
@@ -9,7 +9,7 @@
     ../../../../common/gpu/nvidia/prime.nix
     ../../../../common/gpu/nvidia/ampere
     ../../../../common/pc/laptop
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
     ../edid
   ];
 
diff --git a/lenovo/legion/16achg6/hybrid/default.nix b/lenovo/legion/16achg6/hybrid/default.nix
index fa69491b..f61c4307 100644
--- a/lenovo/legion/16achg6/hybrid/default.nix
+++ b/lenovo/legion/16achg6/hybrid/default.nix
@@ -7,7 +7,7 @@
     ../../../../common/gpu/amd
     ../../../../common/gpu/nvidia/prime.nix
     ../../../../common/pc/laptop
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   services.xserver.videoDrivers = [ "nvidia" ];
@@ -25,4 +25,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/lenovo/legion/16aph8/default.nix b/lenovo/legion/16aph8/default.nix
index 4718cd3d..e44329fa 100644
--- a/lenovo/legion/16aph8/default.nix
+++ b/lenovo/legion/16aph8/default.nix
@@ -7,7 +7,7 @@
     ../../../common/gpu/amd
     ../../../common/gpu/nvidia
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Use latest LTS kernel for more Raphael fixes
diff --git a/lenovo/legion/16arh7h/hybrid/default.nix b/lenovo/legion/16arh7h/hybrid/default.nix
index af6ff64a..1654e23c 100644
--- a/lenovo/legion/16arh7h/hybrid/default.nix
+++ b/lenovo/legion/16arh7h/hybrid/default.nix
@@ -9,7 +9,7 @@
     ../../../../common/gpu/nvidia/prime.nix # prime offload
     ../../../../common/gpu/nvidia/ampere # use open drivers
     ../../../../common/pc/laptop
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   boot.kernelModules = ["amdgpu"];
diff --git a/lenovo/legion/16arh7h/igpu-only/default.nix b/lenovo/legion/16arh7h/igpu-only/default.nix
index c8e477f2..bd61814f 100644
--- a/lenovo/legion/16arh7h/igpu-only/default.nix
+++ b/lenovo/legion/16arh7h/igpu-only/default.nix
@@ -6,6 +6,6 @@
     ../../../../common/gpu/amd
     ../../../../common/gpu/nvidia/disable.nix
     ../../../../common/pc/laptop
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 }
diff --git a/lenovo/legion/16arha7/default.nix b/lenovo/legion/16arha7/default.nix
index 8c258d58..c6e3a8c4 100644
--- a/lenovo/legion/16arha7/default.nix
+++ b/lenovo/legion/16arha7/default.nix
@@ -11,12 +11,12 @@ in
     ../../../common/cpu/amd/pstate.nix
     ../../../common/gpu/amd
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Kernel 6.10 includes the speaker fix, so only install this on systems with older kernels.
   boot.extraModulePackages = lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "6.10") [ lenovo-speaker-fix ];
-  
+
   # √(2560² + 1600²) px / 16 in ≃ 189 dpi
   services.xserver.dpi = 189;
 
diff --git a/lenovo/legion/16irx8h/default.nix b/lenovo/legion/16irx8h/default.nix
index 6d9c772c..e4b6ca86 100644
--- a/lenovo/legion/16irx8h/default.nix
+++ b/lenovo/legion/16irx8h/default.nix
@@ -8,7 +8,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/ada-lovelace
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/hidpi.nix
   ];
 
diff --git a/lenovo/legion/16irx9h/default.nix b/lenovo/legion/16irx9h/default.nix
index f96bc51b..6a8077d8 100644
--- a/lenovo/legion/16irx9h/default.nix
+++ b/lenovo/legion/16irx9h/default.nix
@@ -8,7 +8,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/ada-lovelace
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/hidpi.nix
   ];
 
diff --git a/lenovo/legion/16ithg6/default.nix b/lenovo/legion/16ithg6/default.nix
index 9d6c292f..a0ee3a76 100644
--- a/lenovo/legion/16ithg6/default.nix
+++ b/lenovo/legion/16ithg6/default.nix
@@ -6,7 +6,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/ampere
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/hidpi.nix
   ];
 
diff --git a/lenovo/thinkpad/e14/default.nix b/lenovo/thinkpad/e14/default.nix
index c6948b35..85c83e17 100644
--- a/lenovo/thinkpad/e14/default.nix
+++ b/lenovo/thinkpad/e14/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   boot.kernelParams = [
diff --git a/lenovo/thinkpad/e15/default.nix b/lenovo/thinkpad/e15/default.nix
index a8805138..a54db80e 100644
--- a/lenovo/thinkpad/e15/default.nix
+++ b/lenovo/thinkpad/e15/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../.
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   boot.kernelParams = [
diff --git a/lenovo/thinkpad/l13/default.nix b/lenovo/thinkpad/l13/default.nix
index dcf9a572..2ee6567a 100644
--- a/lenovo/thinkpad/l13/default.nix
+++ b/lenovo/thinkpad/l13/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../../../common/cpu/intel
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../.
   ];
 
diff --git a/lenovo/thinkpad/l14/default.nix b/lenovo/thinkpad/l14/default.nix
index a59ec14c..d33b4bfa 100644
--- a/lenovo/thinkpad/l14/default.nix
+++ b/lenovo/thinkpad/l14/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   boot.kernelParams = [
diff --git a/lenovo/thinkpad/l480/default.nix b/lenovo/thinkpad/l480/default.nix
index d000320d..2568433c 100644
--- a/lenovo/thinkpad/l480/default.nix
+++ b/lenovo/thinkpad/l480/default.nix
@@ -3,7 +3,7 @@
   imports = [
     ../.
     ../../../common/cpu/intel/kaby-lake
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # available cpufreq governors: performance powersave
diff --git a/lenovo/thinkpad/p1/default.nix b/lenovo/thinkpad/p1/default.nix
index f26e01b5..197bfab2 100644
--- a/lenovo/thinkpad/p1/default.nix
+++ b/lenovo/thinkpad/p1/default.nix
@@ -4,7 +4,7 @@
     # might need nvidia module but we don't know the PCI ids:
     # https://github.com/NixOS/nixos-hardware/pull/274#discussion_r650483740
     #../../../common/gpu/nvidia/prime.nix
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Need to set Thunderbolt to "BIOS Assist Mode"
diff --git a/lenovo/thinkpad/p14s/default.nix b/lenovo/thinkpad/p14s/default.nix
index 6e87b7bc..3a19fc1c 100644
--- a/lenovo/thinkpad/p14s/default.nix
+++ b/lenovo/thinkpad/p14s/default.nix
@@ -6,7 +6,7 @@
 
   imports = [
     ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Force use of the amdgpu driver for backlight control on kernel versions where the
diff --git a/lenovo/thinkpad/p16s/default.nix b/lenovo/thinkpad/p16s/default.nix
index 53a9fdf5..83a4942f 100644
--- a/lenovo/thinkpad/p16s/default.nix
+++ b/lenovo/thinkpad/p16s/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
     ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 }
diff --git a/lenovo/thinkpad/p43s/default.nix b/lenovo/thinkpad/p43s/default.nix
index 46632b79..c5e34ff0 100644
--- a/lenovo/thinkpad/p43s/default.nix
+++ b/lenovo/thinkpad/p43s/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../.
     ../../../common/cpu/intel/whiskey-lake
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/gpu/nvidia/pascal
     ../../../common/gpu/nvidia/prime-sync.nix
   ];
diff --git a/lenovo/thinkpad/t14/default.nix b/lenovo/thinkpad/t14/default.nix
index fb42f2b9..2a725bb5 100644
--- a/lenovo/thinkpad/t14/default.nix
+++ b/lenovo/thinkpad/t14/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI.
diff --git a/lenovo/thinkpad/x1-extreme/default.nix b/lenovo/thinkpad/x1-extreme/default.nix
index 2e4c10e0..b816d538 100644
--- a/lenovo/thinkpad/x1-extreme/default.nix
+++ b/lenovo/thinkpad/x1-extreme/default.nix
@@ -2,6 +2,6 @@
   imports = [
     ../.
     ../../../common/cpu/intel
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 }
diff --git a/lenovo/thinkpad/x1-nano/default.nix b/lenovo/thinkpad/x1-nano/default.nix
index a842d437..b67595c3 100644
--- a/lenovo/thinkpad/x1-nano/default.nix
+++ b/lenovo/thinkpad/x1-nano/default.nix
@@ -3,6 +3,6 @@
   imports = [
     ../.
     ../../../common/cpu/intel
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 }
diff --git a/lenovo/thinkpad/x1/10th-gen/default.nix b/lenovo/thinkpad/x1/10th-gen/default.nix
index 75a23d85..8f814835 100644
--- a/lenovo/thinkpad/x1/10th-gen/default.nix
+++ b/lenovo/thinkpad/x1/10th-gen/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ../.
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   # Use the right Intel graphics driver
diff --git a/lenovo/thinkpad/x1/11th-gen/default.nix b/lenovo/thinkpad/x1/11th-gen/default.nix
index 86c2992b..07b32232 100644
--- a/lenovo/thinkpad/x1/11th-gen/default.nix
+++ b/lenovo/thinkpad/x1/11th-gen/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ../.
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   # Use the right Intel graphics driver
diff --git a/lenovo/thinkpad/x1/12th-gen/default.nix b/lenovo/thinkpad/x1/12th-gen/default.nix
index 7d17c714..b13ea279 100644
--- a/lenovo/thinkpad/x1/12th-gen/default.nix
+++ b/lenovo/thinkpad/x1/12th-gen/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ../.
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint";
diff --git a/lenovo/thinkpad/x1/2nd-gen/default.nix b/lenovo/thinkpad/x1/2nd-gen/default.nix
index ac338c61..8d381f23 100644
--- a/lenovo/thinkpad/x1/2nd-gen/default.nix
+++ b/lenovo/thinkpad/x1/2nd-gen/default.nix
@@ -3,7 +3,7 @@
   imports = [
     ../.
     ../../../../common/cpu/intel/haswell
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   services.throttled.enable = lib.mkDefault true;
diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix
index 264faa6c..92cefaf7 100644
--- a/lenovo/thinkpad/x1/6th-gen/default.nix
+++ b/lenovo/thinkpad/x1/6th-gen/default.nix
@@ -10,7 +10,7 @@
   imports = [
     ../.
     ../../../../common/cpu/intel/kaby-lake
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   # New ThinkPads have a different TrackPoint manufacturer/name.
diff --git a/lenovo/thinkpad/x1/7th-gen/default.nix b/lenovo/thinkpad/x1/7th-gen/default.nix
index 6dd02b8e..38c66fd0 100644
--- a/lenovo/thinkpad/x1/7th-gen/default.nix
+++ b/lenovo/thinkpad/x1/7th-gen/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../.
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   services.throttled.enable = lib.mkDefault true;
diff --git a/lenovo/thinkpad/x1/9th-gen/default.nix b/lenovo/thinkpad/x1/9th-gen/default.nix
index a52f02b7..ef8bd9f1 100644
--- a/lenovo/thinkpad/x1/9th-gen/default.nix
+++ b/lenovo/thinkpad/x1/9th-gen/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../.
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   # This solves lagging noticeable on high-resolution screens.
diff --git a/lenovo/thinkpad/x1/yoga/7th-gen/default.nix b/lenovo/thinkpad/x1/yoga/7th-gen/default.nix
index 20c49074..ed1a747f 100644
--- a/lenovo/thinkpad/x1/yoga/7th-gen/default.nix
+++ b/lenovo/thinkpad/x1/yoga/7th-gen/default.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, ... }: {
   imports = [
     ../.
-    ../../../../../common/pc/laptop/ssd
+    ../../../../../common/pc/ssd
   ];
 
   # At least kernel 5.19 is required for the system to work properly.
diff --git a/lenovo/thinkpad/x1/yoga/8th-gen/default.nix b/lenovo/thinkpad/x1/yoga/8th-gen/default.nix
index cc1676cc..d89bbd49 100644
--- a/lenovo/thinkpad/x1/yoga/8th-gen/default.nix
+++ b/lenovo/thinkpad/x1/yoga/8th-gen/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
     ../.
-    ../../../../../common/pc/laptop/ssd
+    ../../../../../common/pc/ssd
   ];
 }
diff --git a/lenovo/thinkpad/x13/common.nix b/lenovo/thinkpad/x13/common.nix
index c45a7a67..131f468c 100644
--- a/lenovo/thinkpad/x13/common.nix
+++ b/lenovo/thinkpad/x13/common.nix
@@ -1,7 +1,7 @@
 { ... }: {
   imports = [
     ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Somehow psmouse does not load automatically on boot for me
diff --git a/lenovo/thinkpad/x270/default.nix b/lenovo/thinkpad/x270/default.nix
index 8e09d2a1..636ef145 100644
--- a/lenovo/thinkpad/x270/default.nix
+++ b/lenovo/thinkpad/x270/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../.
     ../../../common/cpu/intel
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   boot.kernelParams = [
diff --git a/lenovo/thinkpad/x280/default.nix b/lenovo/thinkpad/x280/default.nix
index 5b6121a0..7a3b5508 100644
--- a/lenovo/thinkpad/x280/default.nix
+++ b/lenovo/thinkpad/x280/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../.
     ../../../common/cpu/intel
-    ../../../common/pc/laptop/ssd/default.nix
+    ../../../common/pc/ssd/default.nix
   ];
 
   services.throttled.enable = lib.mkDefault true;
diff --git a/lenovo/thinkpad/x390/default.nix b/lenovo/thinkpad/x390/default.nix
index d06a4aea..80c893ba 100644
--- a/lenovo/thinkpad/x390/default.nix
+++ b/lenovo/thinkpad/x390/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../.
     ../../../common/cpu/intel
-    ../../../common/pc/laptop/ssd/default.nix
+    ../../../common/pc/ssd/default.nix
   ];
 
   services.throttled.enable = lib.mkDefault true;
diff --git a/lenovo/thinkpad/z/default.nix b/lenovo/thinkpad/z/default.nix
index 5d8ba8ac..11dda086 100644
--- a/lenovo/thinkpad/z/default.nix
+++ b/lenovo/thinkpad/z/default.nix
@@ -5,7 +5,7 @@
     ../../../common/cpu/amd/pstate.nix
     ../../../common/gpu/amd
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   hardware.enableRedistributableFirmware = lib.mkDefault true;
diff --git a/malibal/aon/s1/default.nix b/malibal/aon/s1/default.nix
index 86995beb..c682a447 100644
--- a/malibal/aon/s1/default.nix
+++ b/malibal/aon/s1/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
 
     ../../../common/cpu/intel
 
diff --git a/msi/gl62/default.nix b/msi/gl62/default.nix
index 977af651..bae5dea5 100644
--- a/msi/gl62/default.nix
+++ b/msi/gl62/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
     ../../common/cpu/intel
     ../../common/gpu/nvidia/prime.nix
     ../../common/gpu/nvidia/pascal
diff --git a/msi/gl65/10SDR-492/default.nix b/msi/gl65/10SDR-492/default.nix
index 75289d4b..f2e56656 100644
--- a/msi/gl65/10SDR-492/default.nix
+++ b/msi/gl65/10SDR-492/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../../common/cpu/intel/comet-lake
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/turing
diff --git a/omen/15-ce002ns/default.nix b/omen/15-ce002ns/default.nix
index c787d3a0..990d59f8 100644
--- a/omen/15-ce002ns/default.nix
+++ b/omen/15-ce002ns/default.nix
@@ -5,7 +5,7 @@
     ../../common/cpu/intel/kaby-lake
     ../../common/gpu/nvidia/pascal
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
     ../../common/pc/laptop/hdd
   ];
 }
diff --git a/onenetbook/4/default.nix b/onenetbook/4/default.nix
index 6b108b4c..251bc651 100644
--- a/onenetbook/4/default.nix
+++ b/onenetbook/4/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../common/cpu/intel
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
   ];
 
   # OneNetbook 4 has `GXTP7386:00 27C6:011A Stylus` exporting no buttons in 5.12
diff --git a/slimbook/hero/rpl-rtx/default.nix b/slimbook/hero/rpl-rtx/default.nix
index b71c22c7..f1a249de 100644
--- a/slimbook/hero/rpl-rtx/default.nix
+++ b/slimbook/hero/rpl-rtx/default.nix
@@ -6,7 +6,7 @@
     ../../../common/gpu/nvidia/ada-lovelace
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   hardware = {
diff --git a/starlabs/starlite/i5/default.nix b/starlabs/starlite/i5/default.nix
index 018a5766..62e9d5a3 100644
--- a/starlabs/starlite/i5/default.nix
+++ b/starlabs/starlite/i5/default.nix
@@ -3,7 +3,7 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   # Turn on IIO for accelerometer screen rotation.
diff --git a/system76/darp6/default.nix b/system76/darp6/default.nix
index 3f93993e..ff70ac94 100644
--- a/system76/darp6/default.nix
+++ b/system76/darp6/default.nix
@@ -28,7 +28,7 @@ in
   imports = [
     ../.
     ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
   ];
 
   options.hardware.system76.darp6 = {
diff --git a/tuxedo/pulse/14/gen3/default.nix b/tuxedo/pulse/14/gen3/default.nix
index 34cca9ab..52d292cf 100644
--- a/tuxedo/pulse/14/gen3/default.nix
+++ b/tuxedo/pulse/14/gen3/default.nix
@@ -9,7 +9,7 @@
     ../../../../common/cpu/amd/pstate.nix
     ../../../../common/cpu/amd/raphael/igpu.nix
     ../../../../common/pc/laptop
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   # Fixing a power-issue with older kernels.
diff --git a/tuxedo/pulse/15/gen2/default.nix b/tuxedo/pulse/15/gen2/default.nix
index 39ed0064..05c56055 100644
--- a/tuxedo/pulse/15/gen2/default.nix
+++ b/tuxedo/pulse/15/gen2/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../../../../common/cpu/amd
     ../../../../common/gpu/amd
-    ../../../../common/pc/laptop/ssd
+    ../../../../common/pc/ssd
   ];
 
   services.udev.extraRules = builtins.concatStringsSep "\n" (
diff --git a/xiaomi/redmibook/16-pro-2024/default.nix b/xiaomi/redmibook/16-pro-2024/default.nix
index ab76680a..35fe687d 100644
--- a/xiaomi/redmibook/16-pro-2024/default.nix
+++ b/xiaomi/redmibook/16-pro-2024/default.nix
@@ -4,7 +4,7 @@
     ../../fix-boot-quirk.nix
     ../../../common/cpu/intel
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
   ];
 
   hardware.enableRedistributableFirmware = lib.mkDefault true;