diff --git a/overview.nix b/overview.nix
index 614cd871..b5d60e71 100644
--- a/overview.nix
+++ b/overview.nix
@@ -2,6 +2,7 @@
   self,
   lib,
   ngipkgs,
+  packages,
   options,
   ...
 }: let
@@ -23,13 +24,19 @@
     then "[`${self.shortRev}`](https://github.com/ngi-nix/ngipkgs/tree/${self.rev})"
     else self.dirtyRev;
 
+  projects = builtins.attrNames packages;
+
+  /*
   projects = lib.lists.unique (
     map (x: x.meta.ngi.project) (builtins.filter (x: x ? meta.ngi) ngipkgsValues)
   );
+  */
 
-  packagesByProject = project: builtins.filter (x: x.meta.ngi.project or null == project) ngipkgsValues;
+  #packagesByProject = project: builtins.filter (x: x.meta.ngi.project or null == project) ngipkgsValues;
+  packagesByProject = project: builtins.attrValues (builtins.getAttr project packages);
 
-  packagesWithoutProject = packagesByProject null;
+  #packagesWithoutProject = packagesByProject null;
+  packagesWithoutProject = [];
 
   # Options
 
@@ -38,10 +45,14 @@
       builtins.concatMap (x: x.meta.ngi.options) (builtins.filter (x: x ? meta.ngi.options) ngipkgsValues)
     );
 
+  /*
   optionsByProject = project:
     builtins.filter
     (option: anyOption (optionSpecByProject project) option.loc)
     (builtins.attrValues options);
+  */
+
+  optionsByProject = project: (builtins.getAttr project options).optionsNix;
 
   renderOptions = projectOptions:
     lib.strings.optionalString (!empty projectOptions)