diff --git a/home/pkgs.nix b/home/pkgs.nix
index 5e67ea0..dd0767c 100644
--- a/home/pkgs.nix
+++ b/home/pkgs.nix
@@ -69,8 +69,7 @@ with pkgs;
   krita
   ldns
   liboping # oping, ping multiple hosts at once
-  # FIXME: broken in nixpkgs
-  #libreoffice
+  libreoffice
   libvirt
   lsof
   lynis
@@ -123,8 +122,7 @@ with pkgs;
   skim # fzf in Rust
   slurp
   socat
-  # FIXME: broken in nixpkgs
-  #solvespace
+  solvespace
   spotify
   sqlite
   sshfs-fuse
diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix
index d86a8ff..5ff063a 100644
--- a/nixos/stolas/default.nix
+++ b/nixos/stolas/default.nix
@@ -49,8 +49,7 @@
     # For debugging and troubleshooting Secure Boot.
     pkgs.sbctl
     # Framework embedded controller interface
-    # FIXME: build broken in nixpkgs
-    #pkgs.fw-ectool
+    pkgs.fw-ectool
   ];
 
   hardware = {
@@ -63,8 +62,7 @@
       enable = true;
       extraPackages = with pkgs; [
         vaapiVdpau
-        # FIXME: broken in nixpkgs
-        # libvdpau-va-gl
+        libvdpau-va-gl
       ];
     };
   };