diff --git a/package-lock.json b/package-lock.json
index db2d2501..3f72098b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@node-core/doc-kit",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@node-core/doc-kit",
-      "version": "1.3.1",
+      "version": "1.3.2",
       "dependencies": {
         "@actions/core": "^3.0.0",
         "@heroicons/react": "^2.2.0",
diff --git a/package.json b/package.json
index e1e4a9ed..885c7512 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@node-core/doc-kit",
   "type": "module",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nodejs/doc-kit.git"
diff --git a/src/generators/jsx-ast/utils/buildContent.mjs b/src/generators/jsx-ast/utils/buildContent.mjs
index 911771bb..12f54825 100644
--- a/src/generators/jsx-ast/utils/buildContent.mjs
+++ b/src/generators/jsx-ast/utils/buildContent.mjs
@@ -9,7 +9,7 @@ import { SKIP, visit } from 'unist-util-visit';
 import { createJSXElement } from './ast.mjs';
 import { extractHeadings, extractTextContent } from './buildBarProps.mjs';
 import { enforceArray } from '../../../utils/array.mjs';
-import { extractPrimitives } from '../../../utils/misc.mjs';
+import { omitKeys } from '../../../utils/misc.mjs';
 import { JSX_IMPORTS } from '../../web/constants.mjs';
 import {
   STABILITY_LEVELS,
@@ -296,7 +296,13 @@ export const createDocumentLayout = (entries, metadata) =>
  * @returns {Promise<JSXContent>}
  */
 const buildContent = async (metadataEntries, head) => {
-  const metadata = extractPrimitives(head);
+  // The metadata is the heading without the node children
+  const metadata = omitKeys(head, [
+    'content',
+    'heading',
+    'stability',
+    'changes',
+  ]);
 
   // Create root document AST with all layout components and processed content
   const root = createDocumentLayout(metadataEntries, metadata);
diff --git a/src/generators/web/README.md b/src/generators/web/README.md
index 0941b8a7..ed6246aa 100644
--- a/src/generators/web/README.md
+++ b/src/generators/web/README.md
@@ -6,13 +6,16 @@ The `web` generator transforms JSX AST entries into complete web bundles, produc
 
 The `web` generator accepts the following configuration options:
 
-| Name           | Type     | Default                                       | Description                                                           |
-| -------------- | -------- | --------------------------------------------- | --------------------------------------------------------------------- |
-| `output`       | `string` | -                                             | The directory where HTML, JavaScript, and CSS files will be written   |
-| `templatePath` | `string` | `'template.html'`                             | Path to the HTML template file                                        |
-| `editURL`      | `string` | `'${GITHUB_EDIT_URL}/doc/api{path}.md'`       | URL template for "edit this page" links                               |
-| `pageURL`      | `string` | `'{baseURL}/latest-{version}/api{path}.html'` | URL template for documentation page links                             |
-| `imports`      | `object` | See below                                     | Object mapping `#theme/` aliases to component paths for customization |
+| Name             | Type     | Default                                       | Description                                                           |
+| ---------------- | -------- | --------------------------------------------- | --------------------------------------------------------------------- |
+| `output`         | `string` | -                                             | The directory where HTML, JavaScript, and CSS files will be written   |
+| `templatePath`   | `string` | `'template.html'`                             | Path to the HTML template file                                        |
+| `project`        | `string` | `'Node.js'`                                   | Project name used in page titles and the version selector             |
+| `title`          | `string` | `'{project} v{version} Documentation'`        | Title template for HTML pages (supports `{project}`, `{version}`)     |
+| `editURL`        | `string` | `'${GITHUB_EDIT_URL}/doc/api{path}.md'`       | URL template for "edit this page" links                               |
+| `pageURL`        | `string` | `'{baseURL}/latest-{version}/api{path}.html'` | URL template for documentation page links                             |
+| `imports`        | `object` | See below                                     | Object mapping `#theme/` aliases to component paths for customization |
+| `virtualImports` | `object` | `{}`                                          | Additional virtual module mappings merged into the build              |
 
 #### Default `imports`
 
@@ -42,14 +45,16 @@ export default {
 The `web` generator provides a `#theme/config` virtual module that exposes pre-computed configuration as named exports. Any component (including custom overrides) can import the values it needs, and tree-shaking removes the rest.
 
 ```js
-import { title, repository, editURL } from '#theme/config';
+import { project, repository, editURL } from '#theme/config';
 ```
 
 #### Available exports
 
+All scalar (non-object) configuration values are automatically exported. The defaults include:
+
 | Export                   | Type                           | Description                                                                                         |
 | ------------------------ | ------------------------------ | --------------------------------------------------------------------------------------------------- |
-| `title`                  | `string`                       | Site title (e.g. `'Node.js'`)                                                                       |
+| `project`                | `string`                       | Project name (e.g. `'Node.js'`)                                                                     |
 | `repository`             | `string`                       | GitHub repository in `owner/repo` format                                                            |
 | `version`                | `string`                       | Current version label (e.g. `'v22.x'`)                                                              |
 | `versions`               | `Array<{ url, label, major }>` | Pre-computed version entries with labels and URL templates (only `{path}` remains for per-page use) |
diff --git a/src/generators/web/index.mjs b/src/generators/web/index.mjs
index 6d783fbd..e41b76aa 100644
--- a/src/generators/web/index.mjs
+++ b/src/generators/web/index.mjs
@@ -29,7 +29,8 @@ export default createLazyGenerator({
 
   defaultConfiguration: {
     templatePath: join(import.meta.dirname, 'template.html'),
-    title: 'Node.js',
+    project: 'Node.js',
+    title: '{project} v{version} Documentation',
     editURL: `${GITHUB_EDIT_URL}/doc/api{path}.md`,
     pageURL: '{baseURL}/latest-{version}/api{path}.html',
     imports: {
@@ -40,5 +41,6 @@ export default createLazyGenerator({
       '#theme/Footer': join(import.meta.dirname, './ui/components/NoOp'),
       '#theme/Layout': join(import.meta.dirname, './ui/components/Layout'),
     },
+    virtualImports: {},
   },
 });
diff --git a/src/generators/web/template.html b/src/generators/web/template.html
index 71d0de0e..eed99d1b 100644
--- a/src/generators/web/template.html
+++ b/src/generators/web/template.html
@@ -5,10 +5,10 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <link rel="icon" href="https://nodejs.org/static/images/favicons/favicon.png"/>
-  <title>{{title}}</title>
+  <title>{title}</title>
   <meta name="description" content="Node.js® is a free, open-source, cross-platform JavaScript runtime environment that lets developers create servers, web apps, command line tools and scripts.">
-  <link rel="stylesheet" href="{{root}}styles.css" />
-  <meta property="og:title" content="{{ogTitle}}">
+  <link rel="stylesheet" href="{root}styles.css" />
+  <meta property="og:title" content="{title}">
   <meta property="og:description" content="Node.js® is a free, open-source, cross-platform JavaScript runtime environment that lets developers create servers, web apps, command line tools and scripts.">
   <meta property="og:image" content="https://nodejs.org/en/next-data/og/announcement/Node.js%20%E2%80%94%20Run%20JavaScript%20Everywhere" />
   <meta property="og:type" content="website">
@@ -20,12 +20,12 @@
 
   <!-- Apply theme before paint to avoid Flash of Unstyled Content -->
   <script>document.documentElement.setAttribute("data-theme", document.documentElement.style.colorScheme = localStorage.getItem("theme") || (matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light"));</script>
-  <script type="importmap">{{importMap}}</script>
-  <script type="speculationrules">{{speculationRules}}</script>
+  <script type="importmap">{importMap}</script>
+  <script type="speculationrules">{speculationRules}</script>
 </head>
 
 <body>
-  <div id="root">{{dehydrated}}</div>
-  <script type="module" src="{{root}}{{entrypoint}}"></script>
+  <div id="root">{dehydrated}</div>
+  <script type="module" src="{root}{entrypoint}"></script>
 </body>
 </html>
diff --git a/src/generators/web/types.d.ts b/src/generators/web/types.d.ts
index 5feed60e..15229094 100644
--- a/src/generators/web/types.d.ts
+++ b/src/generators/web/types.d.ts
@@ -1,10 +1,13 @@
 import type { JSXContent } from '../jsx-ast/utils/buildContent.mjs';
 
+export type Configuration = {
+  templatePath: string;
+  title: string;
+  imports: Record<string, string>;
+  virtualImports: Record<string, string>;
+};
+
 export type Generator = GeneratorMetadata<
-  {
-    templatePath: string;
-    title: string;
-    imports: Record<string, string>;
-  },
+  Configuration,
   Generate<Array<JSXContent>, AsyncGenerator<{ html: string; css: string }>>
 >;
diff --git a/src/generators/web/ui/components/NavBar.jsx b/src/generators/web/ui/components/NavBar.jsx
index a2315a4c..15fa85dd 100644
--- a/src/generators/web/ui/components/NavBar.jsx
+++ b/src/generators/web/ui/components/NavBar.jsx
@@ -6,7 +6,7 @@ import GitHubIcon from '@node-core/ui-components/Icons/Social/GitHub';
 import SearchBox from './SearchBox';
 import { useTheme } from '../hooks/useTheme.mjs';
 
-import { title, repository } from '#theme/config';
+import { repository } from '#theme/config';
 import Logo from '#theme/Logo';
 
 /**
@@ -28,7 +28,7 @@ export default ({ metadata }) => {
       />
       <a
         href={`https://github.com/${repository}`}
-        aria-label={`${title} GitHub`}
+        aria-label={`View ${repository} on GitHub`}
         className={styles.ghIconWrapper}
       >
         <GitHubIcon />
diff --git a/src/generators/web/ui/components/SearchBox/index.jsx b/src/generators/web/ui/components/SearchBox/index.jsx
index d89c1d4c..d18798c3 100644
--- a/src/generators/web/ui/components/SearchBox/index.jsx
+++ b/src/generators/web/ui/components/SearchBox/index.jsx
@@ -8,6 +8,7 @@ import SearchResults from '@node-core/ui-components/Common/Search/Results';
 import SearchHit from '@node-core/ui-components/Common/Search/Results/Hit';
 
 import styles from './index.module.css';
+import { relative } from '../../../../../utils/url.mjs';
 import useOrama from '../../hooks/useOrama.mjs';
 
 const SearchBox = ({ pathname }) => {
@@ -18,7 +19,14 @@ const SearchBox = ({ pathname }) => {
       <div className={styles.searchResultsContainer}>
         <SearchResults
           noResultsTitle="No results found for"
-          onHit={hit => <SearchHit document={hit.document} />}
+          onHit={hit => (
+            <SearchHit
+              document={{
+                ...hit.document,
+                href: relative(hit.document.href, pathname),
+              }}
+            />
+          )}
         />
       </div>
 
diff --git a/src/generators/web/ui/components/SideBar/index.jsx b/src/generators/web/ui/components/SideBar/index.jsx
index d2965d17..15d3010b 100644
--- a/src/generators/web/ui/components/SideBar/index.jsx
+++ b/src/generators/web/ui/components/SideBar/index.jsx
@@ -4,7 +4,7 @@ import SideBar from '@node-core/ui-components/Containers/Sidebar';
 import styles from './index.module.css';
 import { relative } from '../../../../../utils/url.mjs';
 
-import { title, version, versions, pages } from '#theme/config';
+import { project, version, versions, pages } from '#theme/config';
 
 /**
  * Extracts the major version number from a version string.
@@ -54,7 +54,7 @@ export default ({ metadata }) => {
     >
       <div>
         <Select
-          label={`${title} version`}
+          label={`${project} version`}
           values={compatibleVersions}
           inline={true}
           className={styles.select}
diff --git a/src/generators/web/ui/types.d.ts b/src/generators/web/ui/types.d.ts
index 47a7cbe5..8ecd5574 100644
--- a/src/generators/web/ui/types.d.ts
+++ b/src/generators/web/ui/types.d.ts
@@ -1,4 +1,6 @@
+import { GlobalConfiguration } from '../../../utils/configuration/types';
 import { MetadataEntry } from '../../metadata/types';
+import { Configuration } from '../types';
 
 declare global {
   const SERVER: boolean;
@@ -6,8 +8,20 @@ declare global {
 }
 
 declare module '#theme/config' {
-  export const title: string;
-  export const repository: string;
+  // From global configuration
+  export const repository: GlobalConfiguration['repository'];
+  export const input: GlobalConfiguration['input'];
+  export const ignore: GlobalConfiguration['ignore'];
+  export const output: GlobalConfiguration['output'];
+  export const minify: GlobalConfiguration['minify'];
+  export const baseURL: GlobalConfiguration['baseURL'];
+  export const ref: GlobalConfiguration['ref'];
+
+  // From web configuration
+  export const templatePath: Configuration['templatePath'];
+  export const title: Configuration['title'];
+
+  // From config generation
   export const version: string;
   export const versions: Array<{
     url: string;
@@ -16,7 +30,7 @@ declare module '#theme/config' {
   }>;
   export const editURL: string;
   export const pages: Array<[string, string]>;
-  export const languageDisplayNameMap: Map<string, string>;
+  export const languageDisplayNameMap: Map<string[], string>;
 }
 
 // Omit Primitives from Metadata
diff --git a/src/generators/web/utils/__tests__/config.test.mjs b/src/generators/web/utils/__tests__/config.test.mjs
index 807183ba..4a64149b 100644
--- a/src/generators/web/utils/__tests__/config.test.mjs
+++ b/src/generators/web/utils/__tests__/config.test.mjs
@@ -49,15 +49,11 @@ const makeEntry = (api, name, path) => ({
 
 describe('buildVersionEntries', () => {
   it('creates version entries with labels and URL templates', () => {
-    const config = {
-      changelog: [
+    const result = buildVersionEntries(
+      [
         { version: new SemVer('20.0.0'), isLts: true, isCurrent: false },
         { version: new SemVer('22.0.0'), isLts: false, isCurrent: true },
       ],
-    };
-
-    const result = buildVersionEntries(
-      config,
       'https://nodejs.org/docs/latest-{version}/api{path}.html'
     );
 
@@ -75,25 +71,19 @@ describe('buildVersionEntries', () => {
   });
 
   it('does not append a label suffix for versions that are neither LTS nor Current', () => {
-    const config = {
-      changelog: [
-        { version: new SemVer('18.0.0'), isLts: false, isCurrent: false },
-      ],
-    };
-
-    const result = buildVersionEntries(config, '{version}');
+    const result = buildVersionEntries(
+      [{ version: new SemVer('18.0.0'), isLts: false, isCurrent: false }],
+      '{version}'
+    );
 
     assert.equal(result[0].label, 'v18.x');
   });
 
   it('formats minor versions when minor is non-zero', () => {
-    const config = {
-      changelog: [
-        { version: new SemVer('21.7.0'), isLts: false, isCurrent: false },
-      ],
-    };
-
-    const result = buildVersionEntries(config, '{version}');
+    const result = buildVersionEntries(
+      [{ version: new SemVer('21.7.0'), isLts: false, isCurrent: false }],
+      '{version}'
+    );
 
     assert.equal(result[0].label, 'v21.7.x');
     assert.equal(result[0].major, 21);
diff --git a/src/generators/web/utils/config.mjs b/src/generators/web/utils/config.mjs
index d1a175f7..00d7ae15 100644
--- a/src/generators/web/utils/config.mjs
+++ b/src/generators/web/utils/config.mjs
@@ -5,18 +5,19 @@ import { LANGS } from '@node-core/rehype-shiki';
 import getConfig from '../../../utils/configuration/index.mjs';
 import { populate } from '../../../utils/configuration/templates.mjs';
 import { getVersionFromSemVer } from '../../../utils/generators.mjs';
+import { omitKeys } from '../../../utils/misc.mjs';
 import { getSortedHeadNodes } from '../../jsx-ast/utils/getSortedHeadNodes.mjs';
 
 /**
  * Pre-compute version entries with labels and URL templates.
  * Each entry's `url` still contains `{path}` for per-page resolution.
  *
- * @param {object} config
+ * @param {object} changelog
  * @param {string} pageURLBase
  * @returns {Array<{url: string, label: string, major: number}>}
  */
-export function buildVersionEntries(config, pageURLBase) {
-  return config.changelog.map(({ version, isLts, isCurrent }) => {
+export function buildVersionEntries(changelog, pageURLBase) {
+  return changelog.map(({ version, isLts, isCurrent }) => {
     let label = `v${getVersionFromSemVer(version)}`;
     const url = pageURLBase.replace('{version}', label);
     if (isLts) {
@@ -72,32 +73,31 @@ export function buildLanguageDisplayNameMap() {
  * @returns {string} JavaScript source code string with named exports
  */
 export default function createConfigSource(input) {
-  const config = getConfig('web');
+  const { version: configVersion, ...config } = getConfig('web');
 
-  const currentVersion = `v${config.version.version}`;
-  const templateVars = { ...config, version: currentVersion };
+  const version = `v${configVersion.version}`;
+  const editURL = populate(config.editURL, { ...config, version });
+  const pageURL = populate(config.pageURL, config);
 
-  // Partially populate URL templates: resolve config-level placeholders,
-  // leave {path} for per-page resolution by components
-  const editURL = populate(config.editURL, templateVars);
+  const exports = {
+    ...omitKeys(
+      config,
+      // These are keys that are large, and not needed by components, so we ignore them
+      ['changelog', 'index', 'imports', 'virtualImports']
+    ),
+    version,
+    versions: buildVersionEntries(config.changelog, pageURL),
+    editURL,
+    pages: buildPageList(input),
+  };
 
-  // Resolve the pageURL template once with config-level values, leaving
-  // {version} and {path} as the only remaining placeholders
-  // eslint-disable-next-line no-unused-vars
-  const { version, ...configWithoutVersion } = config;
-  const pageURLBase = populate(config.pageURL, configWithoutVersion);
+  const lines = Object.entries(exports).map(
+    ([k, v]) => `export const ${k} = ${JSON.stringify(v)};`
+  );
 
-  const versions = buildVersionEntries(config, pageURLBase);
-  const pages = buildPageList(input);
-  const shikiDisplayNameMap = buildLanguageDisplayNameMap();
+  lines.push(
+    `export const languageDisplayNameMap = new Map(${JSON.stringify(buildLanguageDisplayNameMap())});`
+  );
 
-  return [
-    `export const title = ${JSON.stringify(config.title)};`,
-    `export const repository = ${JSON.stringify(config.repository)};`,
-    `export const version = ${JSON.stringify(currentVersion)};`,
-    `export const versions = ${JSON.stringify(versions)};`,
-    `export const editURL = ${JSON.stringify(editURL)};`,
-    `export const pages = ${JSON.stringify(pages)};`,
-    `export const languageDisplayNameMap = new Map(${JSON.stringify(shikiDisplayNameMap)});`,
-  ].join('\n');
+  return lines.join('\n');
 }
diff --git a/src/generators/web/utils/processing.mjs b/src/generators/web/utils/processing.mjs
index 286c04c5..4121ae15 100644
--- a/src/generators/web/utils/processing.mjs
+++ b/src/generators/web/utils/processing.mjs
@@ -9,6 +9,7 @@ import { createChunkedRequire } from './chunks.mjs';
 import createConfigSource from './config.mjs';
 import createASTBuilder from './generate.mjs';
 import getConfig from '../../../utils/configuration/index.mjs';
+import { populate } from '../../../utils/configuration/templates.mjs';
 import { minifyHTML } from '../../../utils/html-minifier.mjs';
 import { relative } from '../../../utils/url.mjs';
 import { SPECULATION_RULES } from '../constants.mjs';
@@ -79,11 +80,12 @@ async function executeServerCode(serverCodeMap, requireFn, virtualImports) {
  * @param {string} template - The HTML template string for the output pages.
  */
 export async function processJSXEntries(entries, template) {
-  const { version } = getConfig('web');
+  const config = getConfig('web');
   const astBuilders = createASTBuilder();
   const requireFn = createRequire(import.meta.url);
   const virtualImports = {
     '#theme/config': createConfigSource(entries),
+    ...config.virtualImports,
   };
   // Step 1: Convert JSX AST to JavaScript
   const { serverCodeMap, clientCodeMap } = convertJSXToCode(
@@ -98,26 +100,26 @@ export async function processJSXEntries(entries, template) {
     bundleCode(clientCodeMap, virtualImports),
   ]);
 
-  const titleSuffix = `Node.js v${version.version} Documentation`;
+  const titleSuffix = populate(config.title, {
+    ...config,
+    version: config.version.version,
+  });
 
   // Step 3: Render final HTML pages
   const results = await Promise.all(
     entries.map(async ({ data: { api, path, heading } }) => {
-      const title = `${heading.data.name} | ${titleSuffix}`;
       const root = `${relative('/', path)}/`;
 
       // Replace template placeholders with actual content
-      const renderedHtml = template
-        .replace('{{title}}', title)
-        .replace('{{dehydrated}}', serverBundle.pages.get(`${api}.js`) ?? '')
-        .replace(
-          '{{importMap}}',
-          clientBundle.importMap?.replaceAll('/', root) ?? ''
-        )
-        .replace('{{entrypoint}}', `${api}.js?${randomUUID()}`)
-        .replace('{{speculationRules}}', SPECULATION_RULES)
-        .replace('{{ogTitle}}', title)
-        .replaceAll('{{root}}', root);
+      const renderedHtml = populate(template, {
+        title: `${heading.data.name} | ${titleSuffix}`,
+        dehydrated: serverBundle.pages.get(`${api}.js`) ?? '',
+        importMap: clientBundle.importMap?.replaceAll('/', root) ?? '',
+        entrypoint: `${api}.js?${randomUUID()}`,
+        speculationRules: SPECULATION_RULES,
+        root,
+        path,
+      });
 
       return { html: await minifyHTML(renderedHtml), path };
     })
diff --git a/src/utils/__tests__/misc.test.mjs b/src/utils/__tests__/misc.test.mjs
index 317f1099..d6a1006c 100644
--- a/src/utils/__tests__/misc.test.mjs
+++ b/src/utils/__tests__/misc.test.mjs
@@ -3,7 +3,7 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 
-import { lazy, isPlainObject, extractPrimitives, deepMerge } from '../misc.mjs';
+import { lazy, isPlainObject, omitKeys, deepMerge } from '../misc.mjs';
 
 describe('lazy', () => {
   it('should call the function only once and cache the result', () => {
@@ -38,52 +38,31 @@ describe('isPlainObject', () => {
   });
 });
 
-describe('extractPrimitives', () => {
-  it('should keep string, number, boolean, and null values', () => {
-    const obj = { a: 'hello', b: 42, c: true, d: null };
-    assert.deepStrictEqual(extractPrimitives(obj), {
-      a: 'hello',
-      b: 42,
-      c: true,
-      d: null,
-    });
-  });
-
-  it('should remove object and function values', () => {
-    const obj = {
-      name: 'test',
-      nested: { foo: 'bar' },
-      fn: () => {},
-      count: 5,
-    };
-    const result = extractPrimitives(obj);
-    assert.deepStrictEqual(result, { name: 'test', count: 5 });
+describe('omitKeys', () => {
+  it('should return all properties when no keys are excluded', () => {
+    const obj = { a: 'hello', b: 42, c: true };
+    assert.deepStrictEqual(omitKeys(obj), { a: 'hello', b: 42, c: true });
   });
 
-  it('should keep arrays of primitives', () => {
-    const obj = { tags: ['a', 'b'], name: 'test' };
-    assert.deepStrictEqual(extractPrimitives(obj), {
-      tags: ['a', 'b'],
-      name: 'test',
-    });
+  it('should omit specified keys', () => {
+    const obj = { a: 1, b: 2, c: 3 };
+    assert.deepStrictEqual(omitKeys(obj, ['a', 'c']), { b: 2 });
   });
 
-  it('should remove arrays containing objects', () => {
-    const obj = { items: [{ id: 1 }], name: 'test' };
-    assert.deepStrictEqual(extractPrimitives(obj), { name: 'test' });
+  it('should ignore keys that do not exist', () => {
+    const obj = { a: 1, b: 2 };
+    assert.deepStrictEqual(omitKeys(obj, ['z']), { a: 1, b: 2 });
   });
 
-  it('should keep undefined values', () => {
-    const obj = { a: undefined, b: 'yes' };
-    const result = extractPrimitives(obj);
-    assert.strictEqual('a' in result, true);
-    assert.strictEqual(result.a, undefined);
-    assert.strictEqual(result.b, 'yes');
+  it('should return an empty object when all keys are excluded', () => {
+    const obj = { a: 1, b: 2 };
+    assert.deepStrictEqual(omitKeys(obj, ['a', 'b']), {});
   });
 
-  it('should return an empty object when all values are non-primitive', () => {
-    const obj = { a: {}, b: [{ x: 1 }], c: () => {} };
-    assert.deepStrictEqual(extractPrimitives(obj), {});
+  it('should preserve any value type', () => {
+    const fn = () => {};
+    const obj = { a: fn, b: new Map(), c: null, d: [1, 2] };
+    assert.deepStrictEqual(omitKeys(obj, ['b']), { a: fn, c: null, d: [1, 2] });
   });
 });
 
diff --git a/src/utils/misc.mjs b/src/utils/misc.mjs
index cf987490..353e2971 100644
--- a/src/utils/misc.mjs
+++ b/src/utils/misc.mjs
@@ -20,15 +20,14 @@ export const isPlainObject = value =>
   value !== null && typeof value === 'object' && !Array.isArray(value);
 
 /**
- * Extracts all the primitives from an object
+ * Returns a shallow copy of `obj` without the specified keys.
+ * @param {Record<string, any>} obj
+ * @param {string[]} keys - Keys to exclude
+ * @returns {Record<string, any>}
  */
-export const extractPrimitives = obj =>
+export const omitKeys = (obj, keys = []) =>
   Object.fromEntries(
-    Object.entries(obj).filter(
-      ([, value]) =>
-        value !== Object(value) ||
-        (Array.isArray(value) && value.every(item => item !== Object(item)))
-    )
+    Object.entries(obj).filter(([key]) => !keys.includes(key))
   );
 
 /**