diff --git a/modules/common/linux/default.nix b/modules/common/linux/default.nix
index 0d43ac7..55f5f5f 100644
--- a/modules/common/linux/default.nix
+++ b/modules/common/linux/default.nix
@@ -144,6 +144,10 @@ in
       cfg.luksDevices;
 
     ## Hardware-related
+
+    # Firmware stuff
+    services.fwupd.enable = true;
+
     # Enable sound.
     sound.enable = true;
     services.pipewire = {
diff --git a/nki-yoga-g8/hardware-configuration.nix b/nki-yoga-g8/hardware-configuration.nix
index 6a8d634..584e57e 100644
--- a/nki-yoga-g8/hardware-configuration.nix
+++ b/nki-yoga-g8/hardware-configuration.nix
@@ -44,10 +44,6 @@
   # Fingerprint
   services.fprintd.enable = true;
 
-  # Firmware stuff
-  services.fwupd.enable = true;
-
-
   hardware.sensor.iio.enable = true; # Orientaion and ambient light sensors
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking