diff --git a/machines/core/modules.nix b/machines/core/modules.nix
index d0b1bad..d6f72b4 100644
--- a/machines/core/modules.nix
+++ b/machines/core/modules.nix
@@ -1,12 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  # Enable all firmware modules, so that bluetooth and wifi modules can load
-  # https://github.com/NixOS/nixpkgs/issues/85377#issuecomment-616424682
-  hardware.enableRedistributableFirmware = true;
-  hardware.enableAllFirmware = true;
-  nixpkgs.config.allowUnfree = true;
-
   boot.initrd = {
     availableKernelModules = [
       "ahci"
diff --git a/machines/core/nix.nix b/machines/core/nix.nix
index 7a62982..fd2d82d 100644
--- a/machines/core/nix.nix
+++ b/machines/core/nix.nix
@@ -26,6 +26,7 @@
       unstable.flake = inputs.nixpkgs-unstable;
     };
   };
+  nixpkgs.config.allowUnfree = true;
 
   # auto upgrade with own flakes
   system.autoUpgrade = {