diff --git a/modules/home/suites/development/default.nix b/modules/home/suites/development/default.nix
index aef63dba3..71f28a9c2 100644
--- a/modules/home/suites/development/default.nix
+++ b/modules/home/suites/development/default.nix
@@ -65,8 +65,7 @@ in
         ]
         ++ lib.optionals cfg.sqlEnable [
           dbeaver-bin
-          # FIXME: broken nixpkgs
-          # mysql-workbench
+          mysql-workbench
         ];
 
       shellAliases = {
diff --git a/modules/nixos/system/boot/default.nix b/modules/nixos/system/boot/default.nix
index 85ce95d07..16059c3ec 100644
--- a/modules/nixos/system/boot/default.nix
+++ b/modules/nixos/system/boot/default.nix
@@ -25,8 +25,7 @@ in
       with pkgs;
       [
         efibootmgr
-        # FIXME: broken nixpkgs
-        # efitools
+        efitools
         efivar
       ]
       ++ lib.optionals cfg.secureBoot [ sbctl ];
diff --git a/overlays/master/default.nix b/overlays/master/default.nix
index 942d7bbfb..86ea00a0a 100644
--- a/overlays/master/default.nix
+++ b/overlays/master/default.nix
@@ -3,7 +3,9 @@ _final: _prev: {
   inherit (channels.nixpkgs-master)
     bottles
     ddccontrol
+    efitools
     electron_31
+    mysql-workbench
     unityhub
     ;
 }