diff --git a/boot.nix b/boot.nix
index 648b5cf..e245baf 100644
--- a/boot.nix
+++ b/boot.nix
@@ -23,6 +23,9 @@ let
       };
   };
   cfg = config.aviallon.boot;
+  allowUnfree = (types.isType types.attrs config.nixpkgs.config)
+                && (hasAttr "allowUnfree" config.nixpkgs.config)
+                && (getAttr "allowUnfree" config.nixpkgs.config);
 in
 {
 
@@ -52,7 +55,8 @@ in
 
   config = mkIf cfg.enable {
 
-    hardware.enableAllFirmware = mkOverride 500 true;
+    hardware.enableAllFirmware = allowUnfree;
+    hardware.enableRedistributableFirmware = true;
 
     boot = {
       initrd.kernelModules = [ ];
diff --git a/general.nix b/general.nix
index 8e457ed..5400499 100644
--- a/general.nix
+++ b/general.nix
@@ -85,7 +85,6 @@ in
       gcc.arch = cfg.cpuArch;
       gcc.tune = cfg.cpuTune;
     };
-    nixpkgs.config.allowUnfree = mkDefault true;
 
     nix.buildMachines = [
       {
diff --git a/packages.nix b/packages.nix
index cf2b935..e3a309f 100644
--- a/packages.nix
+++ b/packages.nix
@@ -50,7 +50,6 @@ in
           };
       };
 
-    nixpkgs.config.allowUnfree = true;
 
     environment.systemPackages = with pkgs; with libsForQt5; [
       vim