diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix
index fb8c08f..8094898 100644
--- a/hosts/loki/default.nix
+++ b/hosts/loki/default.nix
@@ -1,13 +1,6 @@
 { inputs, outputs, lib, config, pkgs, ... }: {
   imports = [
-    # inputs.nixos-hardware.nixosModules.dell-xps-13-9310
-    # FIXME 2025-03-19
-    # https://github.com/NixOS/nixpkgs/pull/389711
-    # https://github.com/NixOS/nixpkgs/issues/389620
-    inputs.nixos-hardware.nixosModules.common-cpu-intel
-    inputs.nixos-hardware.nixosModules.common-pc-laptop
-    inputs.nixos-hardware.nixosModules.common-pc-ssd
-    ##################################################
+    inputs.nixos-hardware.nixosModules.dell-xps-13-9310
     ./hardware-configuration.nix
     # ../disko/nvme.nix
     ../workstation
@@ -34,28 +27,4 @@
     kde.enable = false;
     # cosmic.enable = false;
   };
-
-  # FIXME 2025-03-19
-  # https://github.com/NixOS/nixpkgs/pull/389711
-  # https://github.com/NixOS/nixpkgs/issues/389620
-
-  # Includes the Wi-Fi and Bluetooth firmware for the QCA6390.
-  hardware.enableRedistributableFirmware = true;
-
-  # Requires at least 5.12 for working wi-fi and bluetooth.
-  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.12")
-    (lib.mkDefault pkgs.linuxPackages_latest);
-
-  # Touchpad goes over i2c.
-  # Without this we get errors in dmesg on boot and hangs when shutting down.
-  boot.blacklistedKernelModules = [ "psmouse" ];
-
-  # enable finger print sensor.
-  # this has to be configured with `sudo fprintd-enroll <username>`.
-  # services.fprintd.enable = true;
-  # services.fprintd.tod.enable = true;
-  # services.fprintd.tod.driver = pkgs.libfprint-2-tod1-goodix;
-
-  # Allows for updating firmware via `fwupdmgr`.
-  services.fwupd.enable = true;
 }