diff --git a/packages/cli/src/commands/serve.ts b/packages/cli/src/commands/serve.ts
index f8236e0d9..f9a4e1496 100644
--- a/packages/cli/src/commands/serve.ts
+++ b/packages/cli/src/commands/serve.ts
@@ -39,11 +39,11 @@ export const serveCommand = new Command('serve')
       console.log(chalk.green(`✓ Configuration loaded`));
 
       // Import ObjectStack runtime
-      const { ObjectStackKernel } = await import('@objectstack/core');
+      const { ObjectKernel } = await import('@objectstack/core');
       
       // Create kernel instance
       console.log(chalk.yellow(`🔧 Initializing ObjectStack kernel...`));
-      const kernel = new ObjectStackKernel({
+      const kernel = new ObjectKernel({
         metadata: config.metadata || {},
         objects: config.objects || {},
       });
diff --git a/packages/objectql/package.json b/packages/objectql/package.json
index 7131103a2..8db6dfe3d 100644
--- a/packages/objectql/package.json
+++ b/packages/objectql/package.json
@@ -2,8 +2,8 @@
   "name": "@objectstack/objectql",
   "version": "0.7.2",
   "description": "Isomorphic ObjectQL Engine for ObjectStack",
-  "main": "src/index.ts",
-  "types": "src/index.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
     "test": "echo no tests"
diff --git a/packages/objectql/src/engine.ts b/packages/objectql/src/engine.ts
index a0d751f2d..f72ccfbfb 100644
--- a/packages/objectql/src/engine.ts
+++ b/packages/objectql/src/engine.ts
@@ -8,7 +8,7 @@ import {
   DataEngineCountOptions 
 } from '@objectstack/spec/data';
 import { DriverInterface, IDataEngine, Logger, createLogger } from '@objectstack/core';
-import { SchemaRegistry } from './registry';
+import { SchemaRegistry } from './registry.js';
 
 export type HookHandler = (context: HookContext) => Promise<void> | void;
 
diff --git a/packages/objectql/src/index.ts b/packages/objectql/src/index.ts
index 2ec0b8601..f1b3ebe40 100644
--- a/packages/objectql/src/index.ts
+++ b/packages/objectql/src/index.ts
@@ -1,14 +1,14 @@
 // Export Registry
-export { SchemaRegistry } from './registry';
+export { SchemaRegistry } from './registry.js';
 
 // Export Protocol Implementation
-export { ObjectStackProtocolImplementation } from './protocol';
+export { ObjectStackProtocolImplementation } from './protocol.js';
 
 // Export Engine
-export { ObjectQL } from './engine';
-export type { ObjectQLHostContext, HookHandler } from './engine';
+export { ObjectQL } from './engine.js';
+export type { ObjectQLHostContext, HookHandler } from './engine.js';
 
 // Export Plugin Shim
-export { ObjectQLPlugin } from './plugin';
+export { ObjectQLPlugin } from './plugin.js';
 
 // Moved logic to engine.ts
diff --git a/packages/objectql/src/plugin.ts b/packages/objectql/src/plugin.ts
index 5f2571c48..e4c024995 100644
--- a/packages/objectql/src/plugin.ts
+++ b/packages/objectql/src/plugin.ts
@@ -1,5 +1,5 @@
-import { ObjectQL } from './engine';
-import { ObjectStackProtocolImplementation } from './protocol';
+import { ObjectQL } from './engine.js';
+import { ObjectStackProtocolImplementation } from './protocol.js';
 import { Plugin, PluginContext } from '@objectstack/core';
 
 export type { Plugin, PluginContext };
diff --git a/packages/objectql/src/protocol.ts b/packages/objectql/src/protocol.ts
index facee33da..cc5b6652c 100644
--- a/packages/objectql/src/protocol.ts
+++ b/packages/objectql/src/protocol.ts
@@ -17,7 +17,7 @@ import type {
 } from '@objectstack/spec/api';
 
 // We import SchemaRegistry directly since this class lives in the same package
-import { SchemaRegistry } from './registry';
+import { SchemaRegistry } from './registry.js';
 
 /**
  * Simple hash function for ETag generation (browser-compatible)
diff --git a/packages/runtime/src/rest-server.ts b/packages/runtime/src/rest-server.ts
index 3c0e9e9e6..e6d82021c 100644
--- a/packages/runtime/src/rest-server.ts
+++ b/packages/runtime/src/rest-server.ts
@@ -1,5 +1,5 @@
 import { IHttpServer } from '@objectstack/core';
-import { RouteManager } from './route-manager';
+import { RouteManager } from './route-manager.js';
 import { RestServerConfig, CrudOperation, RestApiConfig, CrudEndpointsConfig, MetadataEndpointsConfig, BatchEndpointsConfig, RouteGenerationConfig } from '@objectstack/spec/api';
 import { ObjectStackProtocol } from '@objectstack/spec/api';