diff --git a/packages/api/src/client/index.ts b/packages/api/src/client/index.ts
index f9cd36fafae..9d09dcf77cb 100644
--- a/packages/api/src/client/index.ts
+++ b/packages/api/src/client/index.ts
@@ -4,6 +4,7 @@
 import { XrpcClient, FetchHandler, FetchHandlerOptions } from '@atproto/xrpc'
 import { schemas } from './lexicons'
 import { CID } from 'multiformats/cid'
+import { OmitKey } from './util'
 import * as ComAtprotoAdminDefs from './types/com/atproto/admin/defs'
 import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount'
 import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites'
@@ -1608,7 +1609,7 @@ export class ProfileRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyActorProfile.Record }[]
@@ -1621,7 +1622,7 @@ export class ProfileRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyActorProfile.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.actor.profile',
@@ -1631,25 +1632,30 @@ export class ProfileRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyActorProfile.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.actor.profile'
+    const collection = 'app.bsky.actor.profile'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.actor.profile', rkey: 'self', ...params, record },
+      {
+        collection,
+        rkey: 'self',
+        ...params,
+        record: { ...record, $type: collection },
+      },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -1891,7 +1897,7 @@ export class GeneratorRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedGenerator.Record }[]
@@ -1904,7 +1910,7 @@ export class GeneratorRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyFeedGenerator.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.feed.generator',
@@ -1914,25 +1920,25 @@ export class GeneratorRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyFeedGenerator.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.generator'
+    const collection = 'app.bsky.feed.generator'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.generator', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -1952,7 +1958,7 @@ export class LikeRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedLike.Record }[]
@@ -1965,7 +1971,7 @@ export class LikeRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyFeedLike.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.feed.like',
@@ -1975,25 +1981,25 @@ export class LikeRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyFeedLike.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.like'
+    const collection = 'app.bsky.feed.like'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.like', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2013,7 +2019,7 @@ export class PostRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedPost.Record }[]
@@ -2026,7 +2032,7 @@ export class PostRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyFeedPost.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.feed.post',
@@ -2036,25 +2042,25 @@ export class PostRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyFeedPost.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.post'
+    const collection = 'app.bsky.feed.post'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.post', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2074,7 +2080,7 @@ export class PostgateRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedPostgate.Record }[]
@@ -2087,7 +2093,7 @@ export class PostgateRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyFeedPostgate.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.feed.postgate',
@@ -2097,25 +2103,25 @@ export class PostgateRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyFeedPostgate.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.postgate'
+    const collection = 'app.bsky.feed.postgate'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.postgate', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2135,7 +2141,7 @@ export class RepostRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedRepost.Record }[]
@@ -2148,7 +2154,7 @@ export class RepostRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyFeedRepost.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.feed.repost',
@@ -2158,25 +2164,25 @@ export class RepostRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyFeedRepost.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.repost'
+    const collection = 'app.bsky.feed.repost'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.repost', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2196,7 +2202,7 @@ export class ThreadgateRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedThreadgate.Record }[]
@@ -2209,7 +2215,7 @@ export class ThreadgateRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -2223,25 +2229,25 @@ export class ThreadgateRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyFeedThreadgate.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.threadgate'
+    const collection = 'app.bsky.feed.threadgate'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.threadgate', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2502,7 +2508,7 @@ export class BlockRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphBlock.Record }[]
@@ -2515,7 +2521,7 @@ export class BlockRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyGraphBlock.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.graph.block',
@@ -2525,25 +2531,25 @@ export class BlockRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyGraphBlock.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.block'
+    const collection = 'app.bsky.graph.block'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.block', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2563,7 +2569,7 @@ export class FollowRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphFollow.Record }[]
@@ -2576,7 +2582,7 @@ export class FollowRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyGraphFollow.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.graph.follow',
@@ -2586,25 +2592,25 @@ export class FollowRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyGraphFollow.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.follow'
+    const collection = 'app.bsky.graph.follow'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.follow', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2624,7 +2630,7 @@ export class ListRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphList.Record }[]
@@ -2637,7 +2643,7 @@ export class ListRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyGraphList.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.graph.list',
@@ -2647,25 +2653,25 @@ export class ListRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyGraphList.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.list'
+    const collection = 'app.bsky.graph.list'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.list', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2685,7 +2691,7 @@ export class ListblockRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphListblock.Record }[]
@@ -2698,7 +2704,7 @@ export class ListblockRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -2712,25 +2718,25 @@ export class ListblockRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyGraphListblock.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.listblock'
+    const collection = 'app.bsky.graph.listblock'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.listblock', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2750,7 +2756,7 @@ export class ListitemRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphListitem.Record }[]
@@ -2763,7 +2769,7 @@ export class ListitemRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyGraphListitem.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.graph.listitem',
@@ -2773,25 +2779,25 @@ export class ListitemRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyGraphListitem.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.listitem'
+    const collection = 'app.bsky.graph.listitem'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.listitem', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2811,7 +2817,7 @@ export class StarterpackRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphStarterpack.Record }[]
@@ -2824,7 +2830,7 @@ export class StarterpackRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -2838,25 +2844,25 @@ export class StarterpackRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyGraphStarterpack.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.starterpack'
+    const collection = 'app.bsky.graph.starterpack'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.starterpack', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2898,7 +2904,7 @@ export class ServiceRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyLabelerService.Record }[]
@@ -2911,7 +2917,7 @@ export class ServiceRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -2925,22 +2931,22 @@ export class ServiceRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: AppBskyLabelerService.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.labeler.service'
+    const collection = 'app.bsky.labeler.service'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
       {
-        collection: 'app.bsky.labeler.service',
+        collection,
         rkey: 'self',
         ...params,
-        record,
+        record: { ...record, $type: collection },
       },
       { encoding: 'application/json', headers },
     )
@@ -2948,7 +2954,7 @@ export class ServiceRecord {
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -3247,7 +3253,7 @@ export class DeclarationRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: ChatBskyActorDeclaration.Record }[]
@@ -3260,7 +3266,7 @@ export class DeclarationRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -3274,22 +3280,22 @@ export class DeclarationRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
     record: ChatBskyActorDeclaration.Record,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'chat.bsky.actor.declaration'
+    const collection = 'chat.bsky.actor.declaration'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
       {
-        collection: 'chat.bsky.actor.declaration',
+        collection,
         rkey: 'self',
         ...params,
-        record,
+        record: { ...record, $type: collection },
       },
       { encoding: 'application/json', headers },
     )
@@ -3297,7 +3303,7 @@ export class DeclarationRecord {
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 32bd89f98a4..adc2ae7f0a9 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -1,7 +1,13 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { LexiconDoc, Lexicons } from '@atproto/lexicon'
+import {
+  LexiconDoc,
+  Lexicons,
+  ValidationError,
+  ValidationResult,
+} from '@atproto/lexicon'
+import { $Typed, is$typed, maybe$typed } from './util'
 
 export const schemaDict = {
   ComAtprotoAdminDefs: {
@@ -13575,6 +13581,44 @@ export const schemaDict = {
 
 export const schemas = Object.values(schemaDict)
 export const lexicons: Lexicons = new Lexicons(schemas)
+
+export function validate<V>(v: unknown, id: string, hash: string) {
+  return (
+    maybe$typed(v, id, hash)
+      ? lexicons.validate(`${id}#${hash}`, v)
+      : {
+          success: false,
+          error: new ValidationError(
+            `Must be an object with "${id}#${hash}" $type property`,
+          ),
+        }
+  ) as ValidationResult<V>
+}
+
+export function isValid<V extends { $type?: string }>(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType: true,
+): v is $Typed<V>
+export function isValid<V extends { $type?: string }>(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType?: boolean,
+): v is V
+export function isValid(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType?: boolean,
+) {
+  return (
+    (requiredType ? is$typed : maybe$typed)(v, id, hash) &&
+    validate(v, id, hash).success
+  )
+}
+
 export const ids = {
   ComAtprotoAdminDefs: 'com.atproto.admin.defs',
   ComAtprotoAdminDeleteAccount: 'com.atproto.admin.deleteAccount',
@@ -13825,4 +13869,4 @@ export const ids = {
   ToolsOzoneTeamDeleteMember: 'tools.ozone.team.deleteMember',
   ToolsOzoneTeamListMembers: 'tools.ozone.team.listMembers',
   ToolsOzoneTeamUpdateMember: 'tools.ozone.team.updateMember',
-}
+} as const
diff --git a/packages/api/src/client/types/app/bsky/actor/defs.ts b/packages/api/src/client/types/app/bsky/actor/defs.ts
index 3266a4d0ee5..5e42bd080d5 100644
--- a/packages/api/src/client/types/app/bsky/actor/defs.ts
+++ b/packages/api/src/client/types/app/bsky/actor/defs.ts
@@ -3,15 +3,22 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyGraphDefs from '../graph/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
   did: string
   handle: string
   displayName?: string
@@ -20,25 +27,24 @@ export interface ProfileViewBasic {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   createdAt?: string
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(
-  v: unknown,
-): v is ProfileViewBasic & {
-  $type: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
-} {
-  return is$typed(v, id, 'profileViewBasic')
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewBasic`,
-    v,
-  ) as ValidationResult<ProfileViewBasic>
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
+}
+
+export function isValidProfileViewBasic<V>(v: V) {
+  return isValid<ProfileViewBasic>(v, id, hashProfileViewBasic)
 }
 
 export interface ProfileView {
+  $type?: $Type<'app.bsky.actor.defs', 'profileView'>
   did: string
   handle: string
   displayName?: string
@@ -49,23 +55,24 @@ export interface ProfileView {
   createdAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isProfileView(
-  v: unknown,
-): v is ProfileView & { $type: $Type<'app.bsky.actor.defs', 'profileView'> } {
-  return is$typed(v, id, 'profileView')
+const hashProfileView = 'profileView'
+
+export function isProfileView<V>(v: V) {
+  return is$typed(v, id, hashProfileView)
+}
+
+export function validateProfileView<V>(v: V) {
+  return validate<ProfileView & V>(v, id, hashProfileView)
 }
 
-export function validateProfileView(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileView`,
-    v,
-  ) as ValidationResult<ProfileView>
+export function isValidProfileView<V>(v: V) {
+  return isValid<ProfileView>(v, id, hashProfileView)
 }
 
 export interface ProfileViewDetailed {
+  $type?: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
   did: string
   handle: string
   displayName?: string
@@ -82,70 +89,67 @@ export interface ProfileViewDetailed {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   pinnedPost?: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isProfileViewDetailed(
-  v: unknown,
-): v is ProfileViewDetailed & {
-  $type: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
-} {
-  return is$typed(v, id, 'profileViewDetailed')
+const hashProfileViewDetailed = 'profileViewDetailed'
+
+export function isProfileViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashProfileViewDetailed)
+}
+
+export function validateProfileViewDetailed<V>(v: V) {
+  return validate<ProfileViewDetailed & V>(v, id, hashProfileViewDetailed)
 }
 
-export function validateProfileViewDetailed(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewDetailed`,
-    v,
-  ) as ValidationResult<ProfileViewDetailed>
+export function isValidProfileViewDetailed<V>(v: V) {
+  return isValid<ProfileViewDetailed>(v, id, hashProfileViewDetailed)
 }
 
 export interface ProfileAssociated {
+  $type?: $Type<'app.bsky.actor.defs', 'profileAssociated'>
   lists?: number
   feedgens?: number
   starterPacks?: number
   labeler?: boolean
   chat?: ProfileAssociatedChat
-  [k: string]: unknown
 }
 
-export function isProfileAssociated(
-  v: unknown,
-): v is ProfileAssociated & {
-  $type: $Type<'app.bsky.actor.defs', 'profileAssociated'>
-} {
-  return is$typed(v, id, 'profileAssociated')
+const hashProfileAssociated = 'profileAssociated'
+
+export function isProfileAssociated<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociated)
+}
+
+export function validateProfileAssociated<V>(v: V) {
+  return validate<ProfileAssociated & V>(v, id, hashProfileAssociated)
 }
 
-export function validateProfileAssociated(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileAssociated`,
-    v,
-  ) as ValidationResult<ProfileAssociated>
+export function isValidProfileAssociated<V>(v: V) {
+  return isValid<ProfileAssociated>(v, id, hashProfileAssociated)
 }
 
 export interface ProfileAssociatedChat {
+  $type?: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
-  [k: string]: unknown
 }
 
-export function isProfileAssociatedChat(
-  v: unknown,
-): v is ProfileAssociatedChat & {
-  $type: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
-} {
-  return is$typed(v, id, 'profileAssociatedChat')
+const hashProfileAssociatedChat = 'profileAssociatedChat'
+
+export function isProfileAssociatedChat<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociatedChat)
 }
 
-export function validateProfileAssociatedChat(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileAssociatedChat`,
-    v,
-  ) as ValidationResult<ProfileAssociatedChat>
+export function validateProfileAssociatedChat<V>(v: V) {
+  return validate<ProfileAssociatedChat & V>(v, id, hashProfileAssociatedChat)
+}
+
+export function isValidProfileAssociatedChat<V>(v: V) {
+  return isValid<ProfileAssociatedChat>(v, id, hashProfileAssociatedChat)
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: $Type<'app.bsky.actor.defs', 'viewerState'>
   muted?: boolean
   mutedByList?: AppBskyGraphDefs.ListViewBasic
   blockedBy?: boolean
@@ -154,185 +158,184 @@ export interface ViewerState {
   following?: string
   followedBy?: string
   knownFollowers?: KnownFollowers
-  [k: string]: unknown
 }
 
-export function isViewerState(
-  v: unknown,
-): v is ViewerState & { $type: $Type<'app.bsky.actor.defs', 'viewerState'> } {
-  return is$typed(v, id, 'viewerState')
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
+}
+
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerState`,
-    v,
-  ) as ValidationResult<ViewerState>
+export function isValidViewerState<V>(v: V) {
+  return isValid<ViewerState>(v, id, hashViewerState)
 }
 
 /** The subject's followers whom you also follow */
 export interface KnownFollowers {
+  $type?: $Type<'app.bsky.actor.defs', 'knownFollowers'>
   count: number
   followers: ProfileViewBasic[]
-  [k: string]: unknown
 }
 
-export function isKnownFollowers(
-  v: unknown,
-): v is KnownFollowers & {
-  $type: $Type<'app.bsky.actor.defs', 'knownFollowers'>
-} {
-  return is$typed(v, id, 'knownFollowers')
+const hashKnownFollowers = 'knownFollowers'
+
+export function isKnownFollowers<V>(v: V) {
+  return is$typed(v, id, hashKnownFollowers)
+}
+
+export function validateKnownFollowers<V>(v: V) {
+  return validate<KnownFollowers & V>(v, id, hashKnownFollowers)
 }
 
-export function validateKnownFollowers(v: unknown) {
-  return lexicons.validate(
-    `${id}#knownFollowers`,
-    v,
-  ) as ValidationResult<KnownFollowers>
+export function isValidKnownFollowers<V>(v: V) {
+  return isValid<KnownFollowers>(v, id, hashKnownFollowers)
 }
 
 export type Preferences = (
-  | AdultContentPref
-  | ContentLabelPref
-  | SavedFeedsPref
-  | SavedFeedsPrefV2
-  | PersonalDetailsPref
-  | FeedViewPref
-  | ThreadViewPref
-  | InterestsPref
-  | MutedWordsPref
-  | HiddenPostsPref
-  | BskyAppStatePref
-  | LabelersPref
-  | { $type: string; [k: string]: unknown }
+  | $Typed<AdultContentPref>
+  | $Typed<ContentLabelPref>
+  | $Typed<SavedFeedsPref>
+  | $Typed<SavedFeedsPrefV2>
+  | $Typed<PersonalDetailsPref>
+  | $Typed<FeedViewPref>
+  | $Typed<ThreadViewPref>
+  | $Typed<InterestsPref>
+  | $Typed<MutedWordsPref>
+  | $Typed<HiddenPostsPref>
+  | $Typed<BskyAppStatePref>
+  | $Typed<LabelersPref>
+  | { $type: string }
 )[]
 
 export interface AdultContentPref {
+  $type?: $Type<'app.bsky.actor.defs', 'adultContentPref'>
   enabled: boolean
-  [k: string]: unknown
 }
 
-export function isAdultContentPref(
-  v: unknown,
-): v is AdultContentPref & {
-  $type: $Type<'app.bsky.actor.defs', 'adultContentPref'>
-} {
-  return is$typed(v, id, 'adultContentPref')
+const hashAdultContentPref = 'adultContentPref'
+
+export function isAdultContentPref<V>(v: V) {
+  return is$typed(v, id, hashAdultContentPref)
 }
 
-export function validateAdultContentPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#adultContentPref`,
-    v,
-  ) as ValidationResult<AdultContentPref>
+export function validateAdultContentPref<V>(v: V) {
+  return validate<AdultContentPref & V>(v, id, hashAdultContentPref)
+}
+
+export function isValidAdultContentPref<V>(v: V) {
+  return isValid<AdultContentPref>(v, id, hashAdultContentPref)
 }
 
 export interface ContentLabelPref {
+  $type?: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
   /** Which labeler does this preference apply to? If undefined, applies globally. */
   labelerDid?: string
   label: string
   visibility: 'ignore' | 'show' | 'warn' | 'hide' | (string & {})
-  [k: string]: unknown
 }
 
-export function isContentLabelPref(
-  v: unknown,
-): v is ContentLabelPref & {
-  $type: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
-} {
-  return is$typed(v, id, 'contentLabelPref')
+const hashContentLabelPref = 'contentLabelPref'
+
+export function isContentLabelPref<V>(v: V) {
+  return is$typed(v, id, hashContentLabelPref)
+}
+
+export function validateContentLabelPref<V>(v: V) {
+  return validate<ContentLabelPref & V>(v, id, hashContentLabelPref)
 }
 
-export function validateContentLabelPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#contentLabelPref`,
-    v,
-  ) as ValidationResult<ContentLabelPref>
+export function isValidContentLabelPref<V>(v: V) {
+  return isValid<ContentLabelPref>(v, id, hashContentLabelPref)
 }
 
 export interface SavedFeed {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeed'>
   id: string
   type: 'feed' | 'list' | 'timeline' | (string & {})
   value: string
   pinned: boolean
-  [k: string]: unknown
 }
 
-export function isSavedFeed(
-  v: unknown,
-): v is SavedFeed & { $type: $Type<'app.bsky.actor.defs', 'savedFeed'> } {
-  return is$typed(v, id, 'savedFeed')
+const hashSavedFeed = 'savedFeed'
+
+export function isSavedFeed<V>(v: V) {
+  return is$typed(v, id, hashSavedFeed)
+}
+
+export function validateSavedFeed<V>(v: V) {
+  return validate<SavedFeed & V>(v, id, hashSavedFeed)
 }
 
-export function validateSavedFeed(v: unknown) {
-  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
+export function isValidSavedFeed<V>(v: V) {
+  return isValid<SavedFeed>(v, id, hashSavedFeed)
 }
 
 export interface SavedFeedsPrefV2 {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
   items: SavedFeed[]
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(
-  v: unknown,
-): v is SavedFeedsPrefV2 & {
-  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
-} {
-  return is$typed(v, id, 'savedFeedsPrefV2')
+const hashSavedFeedsPrefV2 = 'savedFeedsPrefV2'
+
+export function isSavedFeedsPrefV2<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPrefV2)
 }
 
-export function validateSavedFeedsPrefV2(v: unknown) {
-  return lexicons.validate(
-    `${id}#savedFeedsPrefV2`,
-    v,
-  ) as ValidationResult<SavedFeedsPrefV2>
+export function validateSavedFeedsPrefV2<V>(v: V) {
+  return validate<SavedFeedsPrefV2 & V>(v, id, hashSavedFeedsPrefV2)
+}
+
+export function isValidSavedFeedsPrefV2<V>(v: V) {
+  return isValid<SavedFeedsPrefV2>(v, id, hashSavedFeedsPrefV2)
 }
 
 export interface SavedFeedsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
   pinned: string[]
   saved: string[]
   timelineIndex?: number
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPref(
-  v: unknown,
-): v is SavedFeedsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
-} {
-  return is$typed(v, id, 'savedFeedsPref')
+const hashSavedFeedsPref = 'savedFeedsPref'
+
+export function isSavedFeedsPref<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPref)
+}
+
+export function validateSavedFeedsPref<V>(v: V) {
+  return validate<SavedFeedsPref & V>(v, id, hashSavedFeedsPref)
 }
 
-export function validateSavedFeedsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#savedFeedsPref`,
-    v,
-  ) as ValidationResult<SavedFeedsPref>
+export function isValidSavedFeedsPref<V>(v: V) {
+  return isValid<SavedFeedsPref>(v, id, hashSavedFeedsPref)
 }
 
 export interface PersonalDetailsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
   /** The birth date of account owner. */
   birthDate?: string
-  [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(
-  v: unknown,
-): v is PersonalDetailsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
-} {
-  return is$typed(v, id, 'personalDetailsPref')
+const hashPersonalDetailsPref = 'personalDetailsPref'
+
+export function isPersonalDetailsPref<V>(v: V) {
+  return is$typed(v, id, hashPersonalDetailsPref)
+}
+
+export function validatePersonalDetailsPref<V>(v: V) {
+  return validate<PersonalDetailsPref & V>(v, id, hashPersonalDetailsPref)
 }
 
-export function validatePersonalDetailsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#personalDetailsPref`,
-    v,
-  ) as ValidationResult<PersonalDetailsPref>
+export function isValidPersonalDetailsPref<V>(v: V) {
+  return isValid<PersonalDetailsPref>(v, id, hashPersonalDetailsPref)
 }
 
 export interface FeedViewPref {
+  $type?: $Type<'app.bsky.actor.defs', 'feedViewPref'>
   /** The URI of the feed, or an identifier which describes the feed. */
   feed: string
   /** Hide replies in the feed. */
@@ -345,23 +348,24 @@ export interface FeedViewPref {
   hideReposts?: boolean
   /** Hide quote posts in the feed. */
   hideQuotePosts?: boolean
-  [k: string]: unknown
 }
 
-export function isFeedViewPref(
-  v: unknown,
-): v is FeedViewPref & { $type: $Type<'app.bsky.actor.defs', 'feedViewPref'> } {
-  return is$typed(v, id, 'feedViewPref')
+const hashFeedViewPref = 'feedViewPref'
+
+export function isFeedViewPref<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPref)
 }
 
-export function validateFeedViewPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#feedViewPref`,
-    v,
-  ) as ValidationResult<FeedViewPref>
+export function validateFeedViewPref<V>(v: V) {
+  return validate<FeedViewPref & V>(v, id, hashFeedViewPref)
+}
+
+export function isValidFeedViewPref<V>(v: V) {
+  return isValid<FeedViewPref>(v, id, hashFeedViewPref)
 }
 
 export interface ThreadViewPref {
+  $type?: $Type<'app.bsky.actor.defs', 'threadViewPref'>
   /** Sorting mode for threads. */
   sort?:
     | 'oldest'
@@ -372,49 +376,47 @@ export interface ThreadViewPref {
     | (string & {})
   /** Show followed users at the top of all replies. */
   prioritizeFollowedUsers?: boolean
-  [k: string]: unknown
 }
 
-export function isThreadViewPref(
-  v: unknown,
-): v is ThreadViewPref & {
-  $type: $Type<'app.bsky.actor.defs', 'threadViewPref'>
-} {
-  return is$typed(v, id, 'threadViewPref')
+const hashThreadViewPref = 'threadViewPref'
+
+export function isThreadViewPref<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPref)
+}
+
+export function validateThreadViewPref<V>(v: V) {
+  return validate<ThreadViewPref & V>(v, id, hashThreadViewPref)
 }
 
-export function validateThreadViewPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadViewPref`,
-    v,
-  ) as ValidationResult<ThreadViewPref>
+export function isValidThreadViewPref<V>(v: V) {
+  return isValid<ThreadViewPref>(v, id, hashThreadViewPref)
 }
 
 export interface InterestsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'interestsPref'>
   /** A list of tags which describe the account owner's interests gathered during onboarding. */
   tags: string[]
-  [k: string]: unknown
 }
 
-export function isInterestsPref(
-  v: unknown,
-): v is InterestsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'interestsPref'>
-} {
-  return is$typed(v, id, 'interestsPref')
+const hashInterestsPref = 'interestsPref'
+
+export function isInterestsPref<V>(v: V) {
+  return is$typed(v, id, hashInterestsPref)
+}
+
+export function validateInterestsPref<V>(v: V) {
+  return validate<InterestsPref & V>(v, id, hashInterestsPref)
 }
 
-export function validateInterestsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#interestsPref`,
-    v,
-  ) as ValidationResult<InterestsPref>
+export function isValidInterestsPref<V>(v: V) {
+  return isValid<InterestsPref>(v, id, hashInterestsPref)
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
 
 /** A word that the account owner has muted. */
 export interface MutedWord {
+  $type?: $Type<'app.bsky.actor.defs', 'mutedWord'>
   id?: string
   /** The muted word itself. */
   value: string
@@ -424,162 +426,165 @@ export interface MutedWord {
   actorTarget: 'all' | 'exclude-following' | (string & {})
   /** The date and time at which the muted word will expire and no longer be applied. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isMutedWord(
-  v: unknown,
-): v is MutedWord & { $type: $Type<'app.bsky.actor.defs', 'mutedWord'> } {
-  return is$typed(v, id, 'mutedWord')
+const hashMutedWord = 'mutedWord'
+
+export function isMutedWord<V>(v: V) {
+  return is$typed(v, id, hashMutedWord)
 }
 
-export function validateMutedWord(v: unknown) {
-  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
+export function validateMutedWord<V>(v: V) {
+  return validate<MutedWord & V>(v, id, hashMutedWord)
+}
+
+export function isValidMutedWord<V>(v: V) {
+  return isValid<MutedWord>(v, id, hashMutedWord)
 }
 
 export interface MutedWordsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
   /** A list of words the account owner has muted. */
   items: MutedWord[]
-  [k: string]: unknown
 }
 
-export function isMutedWordsPref(
-  v: unknown,
-): v is MutedWordsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
-} {
-  return is$typed(v, id, 'mutedWordsPref')
+const hashMutedWordsPref = 'mutedWordsPref'
+
+export function isMutedWordsPref<V>(v: V) {
+  return is$typed(v, id, hashMutedWordsPref)
+}
+
+export function validateMutedWordsPref<V>(v: V) {
+  return validate<MutedWordsPref & V>(v, id, hashMutedWordsPref)
 }
 
-export function validateMutedWordsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#mutedWordsPref`,
-    v,
-  ) as ValidationResult<MutedWordsPref>
+export function isValidMutedWordsPref<V>(v: V) {
+  return isValid<MutedWordsPref>(v, id, hashMutedWordsPref)
 }
 
 export interface HiddenPostsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
   /** A list of URIs of posts the account owner has hidden. */
   items: string[]
-  [k: string]: unknown
 }
 
-export function isHiddenPostsPref(
-  v: unknown,
-): v is HiddenPostsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
-} {
-  return is$typed(v, id, 'hiddenPostsPref')
+const hashHiddenPostsPref = 'hiddenPostsPref'
+
+export function isHiddenPostsPref<V>(v: V) {
+  return is$typed(v, id, hashHiddenPostsPref)
+}
+
+export function validateHiddenPostsPref<V>(v: V) {
+  return validate<HiddenPostsPref & V>(v, id, hashHiddenPostsPref)
 }
 
-export function validateHiddenPostsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#hiddenPostsPref`,
-    v,
-  ) as ValidationResult<HiddenPostsPref>
+export function isValidHiddenPostsPref<V>(v: V) {
+  return isValid<HiddenPostsPref>(v, id, hashHiddenPostsPref)
 }
 
 export interface LabelersPref {
+  $type?: $Type<'app.bsky.actor.defs', 'labelersPref'>
   labelers: LabelerPrefItem[]
-  [k: string]: unknown
 }
 
-export function isLabelersPref(
-  v: unknown,
-): v is LabelersPref & { $type: $Type<'app.bsky.actor.defs', 'labelersPref'> } {
-  return is$typed(v, id, 'labelersPref')
+const hashLabelersPref = 'labelersPref'
+
+export function isLabelersPref<V>(v: V) {
+  return is$typed(v, id, hashLabelersPref)
 }
 
-export function validateLabelersPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelersPref`,
-    v,
-  ) as ValidationResult<LabelersPref>
+export function validateLabelersPref<V>(v: V) {
+  return validate<LabelersPref & V>(v, id, hashLabelersPref)
+}
+
+export function isValidLabelersPref<V>(v: V) {
+  return isValid<LabelersPref>(v, id, hashLabelersPref)
 }
 
 export interface LabelerPrefItem {
+  $type?: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
   did: string
-  [k: string]: unknown
 }
 
-export function isLabelerPrefItem(
-  v: unknown,
-): v is LabelerPrefItem & {
-  $type: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
-} {
-  return is$typed(v, id, 'labelerPrefItem')
+const hashLabelerPrefItem = 'labelerPrefItem'
+
+export function isLabelerPrefItem<V>(v: V) {
+  return is$typed(v, id, hashLabelerPrefItem)
+}
+
+export function validateLabelerPrefItem<V>(v: V) {
+  return validate<LabelerPrefItem & V>(v, id, hashLabelerPrefItem)
 }
 
-export function validateLabelerPrefItem(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerPrefItem`,
-    v,
-  ) as ValidationResult<LabelerPrefItem>
+export function isValidLabelerPrefItem<V>(v: V) {
+  return isValid<LabelerPrefItem>(v, id, hashLabelerPrefItem)
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
 export interface BskyAppStatePref {
+  $type?: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
   activeProgressGuide?: BskyAppProgressGuide
   /** An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. */
   queuedNudges?: string[]
   /** Storage for NUXs the user has encountered. */
   nuxs?: Nux[]
-  [k: string]: unknown
 }
 
-export function isBskyAppStatePref(
-  v: unknown,
-): v is BskyAppStatePref & {
-  $type: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
-} {
-  return is$typed(v, id, 'bskyAppStatePref')
+const hashBskyAppStatePref = 'bskyAppStatePref'
+
+export function isBskyAppStatePref<V>(v: V) {
+  return is$typed(v, id, hashBskyAppStatePref)
+}
+
+export function validateBskyAppStatePref<V>(v: V) {
+  return validate<BskyAppStatePref & V>(v, id, hashBskyAppStatePref)
 }
 
-export function validateBskyAppStatePref(v: unknown) {
-  return lexicons.validate(
-    `${id}#bskyAppStatePref`,
-    v,
-  ) as ValidationResult<BskyAppStatePref>
+export function isValidBskyAppStatePref<V>(v: V) {
+  return isValid<BskyAppStatePref>(v, id, hashBskyAppStatePref)
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
 export interface BskyAppProgressGuide {
+  $type?: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
   guide: string
-  [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(
-  v: unknown,
-): v is BskyAppProgressGuide & {
-  $type: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
-} {
-  return is$typed(v, id, 'bskyAppProgressGuide')
+const hashBskyAppProgressGuide = 'bskyAppProgressGuide'
+
+export function isBskyAppProgressGuide<V>(v: V) {
+  return is$typed(v, id, hashBskyAppProgressGuide)
 }
 
-export function validateBskyAppProgressGuide(v: unknown) {
-  return lexicons.validate(
-    `${id}#bskyAppProgressGuide`,
-    v,
-  ) as ValidationResult<BskyAppProgressGuide>
+export function validateBskyAppProgressGuide<V>(v: V) {
+  return validate<BskyAppProgressGuide & V>(v, id, hashBskyAppProgressGuide)
+}
+
+export function isValidBskyAppProgressGuide<V>(v: V) {
+  return isValid<BskyAppProgressGuide>(v, id, hashBskyAppProgressGuide)
 }
 
 /** A new user experiences (NUX) storage object */
 export interface Nux {
+  $type?: $Type<'app.bsky.actor.defs', 'nux'>
   id: string
   completed: boolean
   /** Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters. */
   data?: string
   /** The date and time at which the NUX will expire and should be considered completed. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isNux(
-  v: unknown,
-): v is Nux & { $type: $Type<'app.bsky.actor.defs', 'nux'> } {
-  return is$typed(v, id, 'nux')
+const hashNux = 'nux'
+
+export function isNux<V>(v: V) {
+  return is$typed(v, id, hashNux)
+}
+
+export function validateNux<V>(v: V) {
+  return validate<Nux & V>(v, id, hashNux)
 }
 
-export function validateNux(v: unknown) {
-  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
+export function isValidNux<V>(v: V) {
+  return isValid<Nux>(v, id, hashNux)
 }
diff --git a/packages/api/src/client/types/app/bsky/actor/getPreferences.ts b/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
index 31e7e98c29d..387315cc221 100644
--- a/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getPreferences'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/actor/getProfile.ts b/packages/api/src/client/types/app/bsky/actor/getProfile.ts
index 6b9b7bc9759..3807b4d6cd9 100644
--- a/packages/api/src/client/types/app/bsky/actor/getProfile.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getProfile.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getProfile'
 
 export interface QueryParams {
diff --git a/packages/api/src/client/types/app/bsky/actor/getProfiles.ts b/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
index cb37b97f1cf..f8f02263f39 100644
--- a/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getProfiles'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   profiles: AppBskyActorDefs.ProfileViewDetailed[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts b/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
index 972adadf066..6f92c4c79dc 100644
--- a/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getSuggestions'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/actor/profile.ts b/packages/api/src/client/types/app/bsky/actor/profile.ts
index 9463df7cd24..666b6c48976 100644
--- a/packages/api/src/client/types/app/bsky/actor/profile.ts
+++ b/packages/api/src/client/types/app/bsky/actor/profile.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.profile'
 
 export interface Record {
+  $type?: $Type<'app.bsky.actor.profile', 'main'>
   displayName?: string
   /** Free-form profile description text. */
   description?: string
@@ -18,21 +25,23 @@ export interface Record {
   avatar?: BlobRef
   /** Larger horizontal image to display behind profile view. */
   banner?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   joinedViaStarterPack?: ComAtprotoRepoStrongRef.Main
   pinnedPost?: ComAtprotoRepoStrongRef.Main
   createdAt?: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.actor.profile', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/actor/putPreferences.ts b/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
index 05f013edf7f..70d7542f85b 100644
--- a/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
@@ -4,17 +4,22 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/actor/searchActors.ts b/packages/api/src/client/types/app/bsky/actor/searchActors.ts
index d9b695f3e07..2c357ba0f12 100644
--- a/packages/api/src/client/types/app/bsky/actor/searchActors.ts
+++ b/packages/api/src/client/types/app/bsky/actor/searchActors.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.searchActors'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
index 69ca089e356..a2c571706f9 100644
--- a/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.searchActorsTypeahead'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileViewBasic[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/embed/defs.ts b/packages/api/src/client/types/app/bsky/embed/defs.ts
index 662d2ea7b80..73c40d8bdcb 100644
--- a/packages/api/src/client/types/app/bsky/embed/defs.ts
+++ b/packages/api/src/client/types/app/bsky/embed/defs.ts
@@ -3,27 +3,34 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
+  $type?: $Type<'app.bsky.embed.defs', 'aspectRatio'>
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isAspectRatio(
-  v: unknown,
-): v is AspectRatio & { $type: $Type<'app.bsky.embed.defs', 'aspectRatio'> } {
-  return is$typed(v, id, 'aspectRatio')
+const hashAspectRatio = 'aspectRatio'
+
+export function isAspectRatio<V>(v: V) {
+  return is$typed(v, id, hashAspectRatio)
+}
+
+export function validateAspectRatio<V>(v: V) {
+  return validate<AspectRatio & V>(v, id, hashAspectRatio)
 }
 
-export function validateAspectRatio(v: unknown) {
-  return lexicons.validate(
-    `${id}#aspectRatio`,
-    v,
-  ) as ValidationResult<AspectRatio>
+export function isValidAspectRatio<V>(v: V) {
+  return isValid<AspectRatio>(v, id, hashAspectRatio)
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/external.ts b/packages/api/src/client/types/app/bsky/embed/external.ts
index 613608f7797..1e4a775c3fe 100644
--- a/packages/api/src/client/types/app/bsky/embed/external.ts
+++ b/packages/api/src/client/types/app/bsky/embed/external.ts
@@ -3,79 +3,96 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
+  $type?: $Type<'app.bsky.embed.external', 'main'>
   external: External
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.external', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface External {
+  $type?: $Type<'app.bsky.embed.external', 'external'>
   uri: string
   title: string
   description: string
   thumb?: BlobRef
-  [k: string]: unknown
 }
 
-export function isExternal(
-  v: unknown,
-): v is External & { $type: $Type<'app.bsky.embed.external', 'external'> } {
-  return is$typed(v, id, 'external')
+const hashExternal = 'external'
+
+export function isExternal<V>(v: V) {
+  return is$typed(v, id, hashExternal)
+}
+
+export function validateExternal<V>(v: V) {
+  return validate<External & V>(v, id, hashExternal)
 }
 
-export function validateExternal(v: unknown) {
-  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
+export function isValidExternal<V>(v: V) {
+  return isValid<External>(v, id, hashExternal)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.external', 'view'>
   external: ViewExternal
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.external', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewExternal {
+  $type?: $Type<'app.bsky.embed.external', 'viewExternal'>
   uri: string
   title: string
   description: string
   thumb?: string
-  [k: string]: unknown
 }
 
-export function isViewExternal(
-  v: unknown,
-): v is ViewExternal & {
-  $type: $Type<'app.bsky.embed.external', 'viewExternal'>
-} {
-  return is$typed(v, id, 'viewExternal')
+const hashViewExternal = 'viewExternal'
+
+export function isViewExternal<V>(v: V) {
+  return is$typed(v, id, hashViewExternal)
+}
+
+export function validateViewExternal<V>(v: V) {
+  return validate<ViewExternal & V>(v, id, hashViewExternal)
 }
 
-export function validateViewExternal(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewExternal`,
-    v,
-  ) as ValidationResult<ViewExternal>
+export function isValidViewExternal<V>(v: V) {
+  return isValid<ViewExternal>(v, id, hashViewExternal)
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/images.ts b/packages/api/src/client/types/app/bsky/embed/images.ts
index 81fc960b1ab..d0c14d0f827 100644
--- a/packages/api/src/client/types/app/bsky/embed/images.ts
+++ b/packages/api/src/client/types/app/bsky/embed/images.ts
@@ -3,61 +3,80 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyEmbedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.images'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.images', 'main'>
   images: Image[]
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.images', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface Image {
+  $type?: $Type<'app.bsky.embed.images', 'image'>
   image: BlobRef
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isImage(
-  v: unknown,
-): v is Image & { $type: $Type<'app.bsky.embed.images', 'image'> } {
-  return is$typed(v, id, 'image')
+const hashImage = 'image'
+
+export function isImage<V>(v: V) {
+  return is$typed(v, id, hashImage)
+}
+
+export function validateImage<V>(v: V) {
+  return validate<Image & V>(v, id, hashImage)
 }
 
-export function validateImage(v: unknown) {
-  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
+export function isValidImage<V>(v: V) {
+  return isValid<Image>(v, id, hashImage)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.images', 'view'>
   images: ViewImage[]
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.images', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewImage {
+  $type?: $Type<'app.bsky.embed.images', 'viewImage'>
   /** Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. */
   thumb: string
   /** Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. */
@@ -65,15 +84,18 @@ export interface ViewImage {
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isViewImage(
-  v: unknown,
-): v is ViewImage & { $type: $Type<'app.bsky.embed.images', 'viewImage'> } {
-  return is$typed(v, id, 'viewImage')
+const hashViewImage = 'viewImage'
+
+export function isViewImage<V>(v: V) {
+  return is$typed(v, id, hashViewImage)
+}
+
+export function validateViewImage<V>(v: V) {
+  return validate<ViewImage & V>(v, id, hashViewImage)
 }
 
-export function validateViewImage(v: unknown) {
-  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
+export function isValidViewImage<V>(v: V) {
+  return isValid<ViewImage>(v, id, hashViewImage)
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/record.ts b/packages/api/src/client/types/app/bsky/embed/record.ts
index 223ad43e5f4..082545b5db4 100644
--- a/packages/api/src/client/types/app/bsky/embed/record.ts
+++ b/packages/api/src/client/types/app/bsky/embed/record.ts
@@ -3,154 +3,168 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedDefs from '../feed/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as AppBskyLabelerDefs from '../labeler/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
-import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as AppBskyFeedDefs from '../feed/defs'
+import type * as AppBskyGraphDefs from '../graph/defs'
+import type * as AppBskyLabelerDefs from '../labeler/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyEmbedImages from './images'
+import type * as AppBskyEmbedVideo from './video'
+import type * as AppBskyEmbedExternal from './external'
+import type * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.record'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.record', 'main'>
   record: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.record', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
+}
+
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.record', 'view'>
   record:
-    | ViewRecord
-    | ViewNotFound
-    | ViewBlocked
-    | ViewDetached
-    | AppBskyFeedDefs.GeneratorView
-    | AppBskyGraphDefs.ListView
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ViewRecord>
+    | $Typed<ViewNotFound>
+    | $Typed<ViewBlocked>
+    | $Typed<ViewDetached>
+    | $Typed<AppBskyFeedDefs.GeneratorView>
+    | $Typed<AppBskyGraphDefs.ListView>
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyGraphDefs.StarterPackViewBasic>
+    | { $type: string }
+}
+
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.record', 'view'> } {
-  return is$typed(v, id, 'view')
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewRecord {
+  $type?: $Type<'app.bsky.embed.record', 'viewRecord'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
   /** The record data itself. */
-  value: {}
+  value: { [_ in string]: unknown }
   labels?: ComAtprotoLabelDefs.Label[]
   replyCount?: number
   repostCount?: number
   likeCount?: number
   quoteCount?: number
   embeds?: (
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   )[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isViewRecord(
-  v: unknown,
-): v is ViewRecord & { $type: $Type<'app.bsky.embed.record', 'viewRecord'> } {
-  return is$typed(v, id, 'viewRecord')
+const hashViewRecord = 'viewRecord'
+
+export function isViewRecord<V>(v: V) {
+  return is$typed(v, id, hashViewRecord)
+}
+
+export function validateViewRecord<V>(v: V) {
+  return validate<ViewRecord & V>(v, id, hashViewRecord)
 }
 
-export function validateViewRecord(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewRecord`,
-    v,
-  ) as ValidationResult<ViewRecord>
+export function isValidViewRecord<V>(v: V) {
+  return isValid<ViewRecord>(v, id, hashViewRecord)
 }
 
 export interface ViewNotFound {
+  $type?: $Type<'app.bsky.embed.record', 'viewNotFound'>
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isViewNotFound(
-  v: unknown,
-): v is ViewNotFound & {
-  $type: $Type<'app.bsky.embed.record', 'viewNotFound'>
-} {
-  return is$typed(v, id, 'viewNotFound')
+const hashViewNotFound = 'viewNotFound'
+
+export function isViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashViewNotFound)
+}
+
+export function validateViewNotFound<V>(v: V) {
+  return validate<ViewNotFound & V>(v, id, hashViewNotFound)
 }
 
-export function validateViewNotFound(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewNotFound`,
-    v,
-  ) as ValidationResult<ViewNotFound>
+export function isValidViewNotFound<V>(v: V) {
+  return isValid<ViewNotFound>(v, id, hashViewNotFound)
 }
 
 export interface ViewBlocked {
+  $type?: $Type<'app.bsky.embed.record', 'viewBlocked'>
   uri: string
   blocked: true
   author: AppBskyFeedDefs.BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isViewBlocked(
-  v: unknown,
-): v is ViewBlocked & { $type: $Type<'app.bsky.embed.record', 'viewBlocked'> } {
-  return is$typed(v, id, 'viewBlocked')
+const hashViewBlocked = 'viewBlocked'
+
+export function isViewBlocked<V>(v: V) {
+  return is$typed(v, id, hashViewBlocked)
 }
 
-export function validateViewBlocked(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewBlocked`,
-    v,
-  ) as ValidationResult<ViewBlocked>
+export function validateViewBlocked<V>(v: V) {
+  return validate<ViewBlocked & V>(v, id, hashViewBlocked)
+}
+
+export function isValidViewBlocked<V>(v: V) {
+  return isValid<ViewBlocked>(v, id, hashViewBlocked)
 }
 
 export interface ViewDetached {
+  $type?: $Type<'app.bsky.embed.record', 'viewDetached'>
   uri: string
   detached: true
-  [k: string]: unknown
 }
 
-export function isViewDetached(
-  v: unknown,
-): v is ViewDetached & {
-  $type: $Type<'app.bsky.embed.record', 'viewDetached'>
-} {
-  return is$typed(v, id, 'viewDetached')
+const hashViewDetached = 'viewDetached'
+
+export function isViewDetached<V>(v: V) {
+  return is$typed(v, id, hashViewDetached)
+}
+
+export function validateViewDetached<V>(v: V) {
+  return validate<ViewDetached & V>(v, id, hashViewDetached)
 }
 
-export function validateViewDetached(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewDetached`,
-    v,
-  ) as ValidationResult<ViewDetached>
+export function isValidViewDetached<V>(v: V) {
+  return isValid<ViewDetached>(v, id, hashViewDetached)
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts b/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
index 7c382d41853..c22958741f3 100644
--- a/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
@@ -3,51 +3,65 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyEmbedRecord from './record'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedRecord from './record'
+import type * as AppBskyEmbedImages from './images'
+import type * as AppBskyEmbedVideo from './video'
+import type * as AppBskyEmbedExternal from './external'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.recordWithMedia'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.recordWithMedia', 'main'>
   record: AppBskyEmbedRecord.Main
   media:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | { $type: string }
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.recordWithMedia', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.recordWithMedia', 'view'>
   record: AppBskyEmbedRecord.View
   media:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | { $type: string }
+}
+
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.recordWithMedia', 'view'> } {
-  return is$typed(v, id, 'view')
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/video.ts b/packages/api/src/client/types/app/bsky/embed/video.ts
index eefabf0f660..3b8880139a1 100644
--- a/packages/api/src/client/types/app/bsky/embed/video.ts
+++ b/packages/api/src/client/types/app/bsky/embed/video.ts
@@ -3,62 +3,80 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyEmbedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.video'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.video', 'main'>
   video: BlobRef
   captions?: Caption[]
   /** Alt text description of the video, for accessibility. */
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.video', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface Caption {
+  $type?: $Type<'app.bsky.embed.video', 'caption'>
   lang: string
   file: BlobRef
-  [k: string]: unknown
 }
 
-export function isCaption(
-  v: unknown,
-): v is Caption & { $type: $Type<'app.bsky.embed.video', 'caption'> } {
-  return is$typed(v, id, 'caption')
+const hashCaption = 'caption'
+
+export function isCaption<V>(v: V) {
+  return is$typed(v, id, hashCaption)
 }
 
-export function validateCaption(v: unknown) {
-  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
+export function validateCaption<V>(v: V) {
+  return validate<Caption & V>(v, id, hashCaption)
+}
+
+export function isValidCaption<V>(v: V) {
+  return isValid<Caption>(v, id, hashCaption)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.video', 'view'>
   cid: string
   playlist: string
   thumbnail?: string
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.video', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/defs.ts b/packages/api/src/client/types/app/bsky/feed/defs.ts
index 2447b305a2d..1269ef50b0a 100644
--- a/packages/api/src/client/types/app/bsky/feed/defs.ts
+++ b/packages/api/src/client/types/app/bsky/feed/defs.ts
@@ -3,32 +3,39 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyGraphDefs from '../graph/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyEmbedImages from '../embed/images'
+import type * as AppBskyEmbedVideo from '../embed/video'
+import type * as AppBskyEmbedExternal from '../embed/external'
+import type * as AppBskyEmbedRecord from '../embed/record'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyGraphDefs from '../graph/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.defs'
 
 export interface PostView {
+  $type?: $Type<'app.bsky.feed.defs', 'postView'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
-  record: {}
+  record: { [_ in string]: unknown }
   embed?:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | AppBskyEmbedRecord.View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   replyCount?: number
   repostCount?: number
   likeCount?: number
@@ -37,215 +44,230 @@ export interface PostView {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   threadgate?: ThreadgateView
-  [k: string]: unknown
 }
 
-export function isPostView(
-  v: unknown,
-): v is PostView & { $type: $Type<'app.bsky.feed.defs', 'postView'> } {
-  return is$typed(v, id, 'postView')
+const hashPostView = 'postView'
+
+export function isPostView<V>(v: V) {
+  return is$typed(v, id, hashPostView)
+}
+
+export function validatePostView<V>(v: V) {
+  return validate<PostView & V>(v, id, hashPostView)
 }
 
-export function validatePostView(v: unknown) {
-  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
+export function isValidPostView<V>(v: V) {
+  return isValid<PostView>(v, id, hashPostView)
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: $Type<'app.bsky.feed.defs', 'viewerState'>
   repost?: string
   like?: string
   threadMuted?: boolean
   replyDisabled?: boolean
   embeddingDisabled?: boolean
   pinned?: boolean
-  [k: string]: unknown
 }
 
-export function isViewerState(
-  v: unknown,
-): v is ViewerState & { $type: $Type<'app.bsky.feed.defs', 'viewerState'> } {
-  return is$typed(v, id, 'viewerState')
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
+}
+
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerState`,
-    v,
-  ) as ValidationResult<ViewerState>
+export function isValidViewerState<V>(v: V) {
+  return isValid<ViewerState>(v, id, hashViewerState)
 }
 
 export interface FeedViewPost {
+  $type?: $Type<'app.bsky.feed.defs', 'feedViewPost'>
   post: PostView
   reply?: ReplyRef
-  reason?: ReasonRepost | ReasonPin | { $type: string; [k: string]: unknown }
+  reason?: $Typed<ReasonRepost> | $Typed<ReasonPin> | { $type: string }
   /** Context provided by feed generator that may be passed back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isFeedViewPost(
-  v: unknown,
-): v is FeedViewPost & { $type: $Type<'app.bsky.feed.defs', 'feedViewPost'> } {
-  return is$typed(v, id, 'feedViewPost')
+const hashFeedViewPost = 'feedViewPost'
+
+export function isFeedViewPost<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPost)
+}
+
+export function validateFeedViewPost<V>(v: V) {
+  return validate<FeedViewPost & V>(v, id, hashFeedViewPost)
 }
 
-export function validateFeedViewPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#feedViewPost`,
-    v,
-  ) as ValidationResult<FeedViewPost>
+export function isValidFeedViewPost<V>(v: V) {
+  return isValid<FeedViewPost>(v, id, hashFeedViewPost)
 }
 
 export interface ReplyRef {
+  $type?: $Type<'app.bsky.feed.defs', 'replyRef'>
   root:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   parent:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
-  [k: string]: unknown
 }
 
-export function isReplyRef(
-  v: unknown,
-): v is ReplyRef & { $type: $Type<'app.bsky.feed.defs', 'replyRef'> } {
-  return is$typed(v, id, 'replyRef')
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
+}
+
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown) {
-  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
+export function isValidReplyRef<V>(v: V) {
+  return isValid<ReplyRef>(v, id, hashReplyRef)
 }
 
 export interface ReasonRepost {
+  $type?: $Type<'app.bsky.feed.defs', 'reasonRepost'>
   by: AppBskyActorDefs.ProfileViewBasic
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isReasonRepost(
-  v: unknown,
-): v is ReasonRepost & { $type: $Type<'app.bsky.feed.defs', 'reasonRepost'> } {
-  return is$typed(v, id, 'reasonRepost')
+const hashReasonRepost = 'reasonRepost'
+
+export function isReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashReasonRepost)
+}
+
+export function validateReasonRepost<V>(v: V) {
+  return validate<ReasonRepost & V>(v, id, hashReasonRepost)
 }
 
-export function validateReasonRepost(v: unknown) {
-  return lexicons.validate(
-    `${id}#reasonRepost`,
-    v,
-  ) as ValidationResult<ReasonRepost>
+export function isValidReasonRepost<V>(v: V) {
+  return isValid<ReasonRepost>(v, id, hashReasonRepost)
 }
 
 export interface ReasonPin {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.defs', 'reasonPin'>
 }
 
-export function isReasonPin(
-  v: unknown,
-): v is ReasonPin & { $type: $Type<'app.bsky.feed.defs', 'reasonPin'> } {
-  return is$typed(v, id, 'reasonPin')
+const hashReasonPin = 'reasonPin'
+
+export function isReasonPin<V>(v: V) {
+  return is$typed(v, id, hashReasonPin)
 }
 
-export function validateReasonPin(v: unknown) {
-  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
+export function validateReasonPin<V>(v: V) {
+  return validate<ReasonPin & V>(v, id, hashReasonPin)
+}
+
+export function isValidReasonPin<V>(v: V) {
+  return isValid<ReasonPin>(v, id, hashReasonPin)
 }
 
 export interface ThreadViewPost {
+  $type?: $Type<'app.bsky.feed.defs', 'threadViewPost'>
   post: PostView
   parent?:
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   replies?: (
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
-export function isThreadViewPost(
-  v: unknown,
-): v is ThreadViewPost & {
-  $type: $Type<'app.bsky.feed.defs', 'threadViewPost'>
-} {
-  return is$typed(v, id, 'threadViewPost')
+const hashThreadViewPost = 'threadViewPost'
+
+export function isThreadViewPost<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPost)
 }
 
-export function validateThreadViewPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadViewPost`,
-    v,
-  ) as ValidationResult<ThreadViewPost>
+export function validateThreadViewPost<V>(v: V) {
+  return validate<ThreadViewPost & V>(v, id, hashThreadViewPost)
+}
+
+export function isValidThreadViewPost<V>(v: V) {
+  return isValid<ThreadViewPost>(v, id, hashThreadViewPost)
 }
 
 export interface NotFoundPost {
+  $type?: $Type<'app.bsky.feed.defs', 'notFoundPost'>
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundPost(
-  v: unknown,
-): v is NotFoundPost & { $type: $Type<'app.bsky.feed.defs', 'notFoundPost'> } {
-  return is$typed(v, id, 'notFoundPost')
+const hashNotFoundPost = 'notFoundPost'
+
+export function isNotFoundPost<V>(v: V) {
+  return is$typed(v, id, hashNotFoundPost)
+}
+
+export function validateNotFoundPost<V>(v: V) {
+  return validate<NotFoundPost & V>(v, id, hashNotFoundPost)
 }
 
-export function validateNotFoundPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#notFoundPost`,
-    v,
-  ) as ValidationResult<NotFoundPost>
+export function isValidNotFoundPost<V>(v: V) {
+  return isValid<NotFoundPost>(v, id, hashNotFoundPost)
 }
 
 export interface BlockedPost {
+  $type?: $Type<'app.bsky.feed.defs', 'blockedPost'>
   uri: string
   blocked: true
   author: BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isBlockedPost(
-  v: unknown,
-): v is BlockedPost & { $type: $Type<'app.bsky.feed.defs', 'blockedPost'> } {
-  return is$typed(v, id, 'blockedPost')
+const hashBlockedPost = 'blockedPost'
+
+export function isBlockedPost<V>(v: V) {
+  return is$typed(v, id, hashBlockedPost)
+}
+
+export function validateBlockedPost<V>(v: V) {
+  return validate<BlockedPost & V>(v, id, hashBlockedPost)
 }
 
-export function validateBlockedPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#blockedPost`,
-    v,
-  ) as ValidationResult<BlockedPost>
+export function isValidBlockedPost<V>(v: V) {
+  return isValid<BlockedPost>(v, id, hashBlockedPost)
 }
 
 export interface BlockedAuthor {
+  $type?: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
   did: string
   viewer?: AppBskyActorDefs.ViewerState
-  [k: string]: unknown
 }
 
-export function isBlockedAuthor(
-  v: unknown,
-): v is BlockedAuthor & {
-  $type: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
-} {
-  return is$typed(v, id, 'blockedAuthor')
+const hashBlockedAuthor = 'blockedAuthor'
+
+export function isBlockedAuthor<V>(v: V) {
+  return is$typed(v, id, hashBlockedAuthor)
 }
 
-export function validateBlockedAuthor(v: unknown) {
-  return lexicons.validate(
-    `${id}#blockedAuthor`,
-    v,
-  ) as ValidationResult<BlockedAuthor>
+export function validateBlockedAuthor<V>(v: V) {
+  return validate<BlockedAuthor & V>(v, id, hashBlockedAuthor)
+}
+
+export function isValidBlockedAuthor<V>(v: V) {
+  return isValid<BlockedAuthor>(v, id, hashBlockedAuthor)
 }
 
 export interface GeneratorView {
+  $type?: $Type<'app.bsky.feed.defs', 'generatorView'>
   uri: string
   cid: string
   did: string
@@ -259,133 +281,127 @@ export interface GeneratorView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: GeneratorViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isGeneratorView(
-  v: unknown,
-): v is GeneratorView & {
-  $type: $Type<'app.bsky.feed.defs', 'generatorView'>
-} {
-  return is$typed(v, id, 'generatorView')
+const hashGeneratorView = 'generatorView'
+
+export function isGeneratorView<V>(v: V) {
+  return is$typed(v, id, hashGeneratorView)
 }
 
-export function validateGeneratorView(v: unknown) {
-  return lexicons.validate(
-    `${id}#generatorView`,
-    v,
-  ) as ValidationResult<GeneratorView>
+export function validateGeneratorView<V>(v: V) {
+  return validate<GeneratorView & V>(v, id, hashGeneratorView)
+}
+
+export function isValidGeneratorView<V>(v: V) {
+  return isValid<GeneratorView>(v, id, hashGeneratorView)
 }
 
 export interface GeneratorViewerState {
+  $type?: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
   like?: string
-  [k: string]: unknown
 }
 
-export function isGeneratorViewerState(
-  v: unknown,
-): v is GeneratorViewerState & {
-  $type: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
-} {
-  return is$typed(v, id, 'generatorViewerState')
+const hashGeneratorViewerState = 'generatorViewerState'
+
+export function isGeneratorViewerState<V>(v: V) {
+  return is$typed(v, id, hashGeneratorViewerState)
+}
+
+export function validateGeneratorViewerState<V>(v: V) {
+  return validate<GeneratorViewerState & V>(v, id, hashGeneratorViewerState)
 }
 
-export function validateGeneratorViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#generatorViewerState`,
-    v,
-  ) as ValidationResult<GeneratorViewerState>
+export function isValidGeneratorViewerState<V>(v: V) {
+  return isValid<GeneratorViewerState>(v, id, hashGeneratorViewerState)
 }
 
 export interface SkeletonFeedPost {
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
   post: string
   reason?:
-    | SkeletonReasonRepost
-    | SkeletonReasonPin
-    | { $type: string; [k: string]: unknown }
+    | $Typed<SkeletonReasonRepost>
+    | $Typed<SkeletonReasonPin>
+    | { $type: string }
   /** Context that will be passed through to client and may be passed to feed generator back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(
-  v: unknown,
-): v is SkeletonFeedPost & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
-} {
-  return is$typed(v, id, 'skeletonFeedPost')
+const hashSkeletonFeedPost = 'skeletonFeedPost'
+
+export function isSkeletonFeedPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonFeedPost)
+}
+
+export function validateSkeletonFeedPost<V>(v: V) {
+  return validate<SkeletonFeedPost & V>(v, id, hashSkeletonFeedPost)
 }
 
-export function validateSkeletonFeedPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonFeedPost`,
-    v,
-  ) as ValidationResult<SkeletonFeedPost>
+export function isValidSkeletonFeedPost<V>(v: V) {
+  return isValid<SkeletonFeedPost>(v, id, hashSkeletonFeedPost)
 }
 
 export interface SkeletonReasonRepost {
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
   repost: string
-  [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(
-  v: unknown,
-): v is SkeletonReasonRepost & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
-} {
-  return is$typed(v, id, 'skeletonReasonRepost')
+const hashSkeletonReasonRepost = 'skeletonReasonRepost'
+
+export function isSkeletonReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonRepost)
+}
+
+export function validateSkeletonReasonRepost<V>(v: V) {
+  return validate<SkeletonReasonRepost & V>(v, id, hashSkeletonReasonRepost)
 }
 
-export function validateSkeletonReasonRepost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonReasonRepost`,
-    v,
-  ) as ValidationResult<SkeletonReasonRepost>
+export function isValidSkeletonReasonRepost<V>(v: V) {
+  return isValid<SkeletonReasonRepost>(v, id, hashSkeletonReasonRepost)
 }
 
 export interface SkeletonReasonPin {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
+}
+
+const hashSkeletonReasonPin = 'skeletonReasonPin'
+
+export function isSkeletonReasonPin<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonPin)
 }
 
-export function isSkeletonReasonPin(
-  v: unknown,
-): v is SkeletonReasonPin & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
-} {
-  return is$typed(v, id, 'skeletonReasonPin')
+export function validateSkeletonReasonPin<V>(v: V) {
+  return validate<SkeletonReasonPin & V>(v, id, hashSkeletonReasonPin)
 }
 
-export function validateSkeletonReasonPin(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonReasonPin`,
-    v,
-  ) as ValidationResult<SkeletonReasonPin>
+export function isValidSkeletonReasonPin<V>(v: V) {
+  return isValid<SkeletonReasonPin>(v, id, hashSkeletonReasonPin)
 }
 
 export interface ThreadgateView {
+  $type?: $Type<'app.bsky.feed.defs', 'threadgateView'>
   uri?: string
   cid?: string
-  record?: {}
+  record?: { [_ in string]: unknown }
   lists?: AppBskyGraphDefs.ListViewBasic[]
-  [k: string]: unknown
 }
 
-export function isThreadgateView(
-  v: unknown,
-): v is ThreadgateView & {
-  $type: $Type<'app.bsky.feed.defs', 'threadgateView'>
-} {
-  return is$typed(v, id, 'threadgateView')
+const hashThreadgateView = 'threadgateView'
+
+export function isThreadgateView<V>(v: V) {
+  return is$typed(v, id, hashThreadgateView)
+}
+
+export function validateThreadgateView<V>(v: V) {
+  return validate<ThreadgateView & V>(v, id, hashThreadgateView)
 }
 
-export function validateThreadgateView(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadgateView`,
-    v,
-  ) as ValidationResult<ThreadgateView>
+export function isValidThreadgateView<V>(v: V) {
+  return isValid<ThreadgateView>(v, id, hashThreadgateView)
 }
 
 export interface Interaction {
+  $type?: $Type<'app.bsky.feed.defs', 'interaction'>
   item?: string
   event?:
     | 'app.bsky.feed.defs#requestLess'
@@ -403,20 +419,20 @@ export interface Interaction {
     | (string & {})
   /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isInteraction(
-  v: unknown,
-): v is Interaction & { $type: $Type<'app.bsky.feed.defs', 'interaction'> } {
-  return is$typed(v, id, 'interaction')
+const hashInteraction = 'interaction'
+
+export function isInteraction<V>(v: V) {
+  return is$typed(v, id, hashInteraction)
+}
+
+export function validateInteraction<V>(v: V) {
+  return validate<Interaction & V>(v, id, hashInteraction)
 }
 
-export function validateInteraction(v: unknown) {
-  return lexicons.validate(
-    `${id}#interaction`,
-    v,
-  ) as ValidationResult<Interaction>
+export function isValidInteraction<V>(v: V) {
+  return isValid<Interaction>(v, id, hashInteraction)
 }
 
 /** Request that less content like the given feed item be shown in the feed */
diff --git a/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts b/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
index a9dd02e4c45..c93c90d7ab8 100644
--- a/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.describeFeedGenerator'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface OutputSchema {
   did: string
   feeds: Feed[]
   links?: Links
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -36,34 +41,40 @@ export function toKnownErr(e: any) {
 }
 
 export interface Feed {
+  $type?: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeed(
-  v: unknown,
-): v is Feed & { $type: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'> } {
-  return is$typed(v, id, 'feed')
+const hashFeed = 'feed'
+
+export function isFeed<V>(v: V) {
+  return is$typed(v, id, hashFeed)
+}
+
+export function validateFeed<V>(v: V) {
+  return validate<Feed & V>(v, id, hashFeed)
 }
 
-export function validateFeed(v: unknown) {
-  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
+export function isValidFeed<V>(v: V) {
+  return isValid<Feed>(v, id, hashFeed)
 }
 
 export interface Links {
+  $type?: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(
-  v: unknown,
-): v is Links & {
-  $type: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
-} {
-  return is$typed(v, id, 'links')
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
+}
+
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown) {
-  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
+export function isValidLinks<V>(v: V) {
+  return isValid<Links>(v, id, hashLinks)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/generator.ts b/packages/api/src/client/types/app/bsky/feed/generator.ts
index b92a1a44ff9..9c7a3fc0d62 100644
--- a/packages/api/src/client/types/app/bsky/feed/generator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/generator.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.generator'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.generator', 'main'>
   did: string
   displayName: string
   description?: string
@@ -18,19 +25,21 @@ export interface Record {
   avatar?: BlobRef
   /** Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions */
   acceptsInteractions?: boolean
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.generator', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts b/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
index 98032703d46..e8b037e4b84 100644
--- a/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getActorFeeds'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts b/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
index 99545f33fe1..cb673b1efc7 100644
--- a/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getActorLikes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts b/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
index 25bd09b0c5a..2b85919c8e1 100644
--- a/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getAuthorFeed'
 
 export interface QueryParams {
@@ -29,7 +35,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeed.ts b/packages/api/src/client/types/app/bsky/feed/getFeed.ts
index 77cf2bf2d8e..f51b0802123 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeed.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeed'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts b/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
index d381a0e90d2..d3a244a3812 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedGenerator'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   isOnline: boolean
   /** Indicates whether the feed generator service is compatible with the record declaration. */
   isValid: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts b/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
index 76f852faf78..842ec2aef5f 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedGenerators'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts b/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
index 76638027d38..c94141820e8 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedSkeleton'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.SkeletonFeedPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getLikes.ts b/packages/api/src/client/types/app/bsky/feed/getLikes.ts
index 2e3f58a2a4c..2b3a9f5e0fc 100644
--- a/packages/api/src/client/types/app/bsky/feed/getLikes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getLikes.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getLikes'
 
 export interface QueryParams {
@@ -26,7 +32,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   likes: Like[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -45,18 +50,22 @@ export function toKnownErr(e: any) {
 }
 
 export interface Like {
+  $type?: $Type<'app.bsky.feed.getLikes', 'like'>
   indexedAt: string
   createdAt: string
   actor: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isLike(
-  v: unknown,
-): v is Like & { $type: $Type<'app.bsky.feed.getLikes', 'like'> } {
-  return is$typed(v, id, 'like')
+const hashLike = 'like'
+
+export function isLike<V>(v: V) {
+  return is$typed(v, id, hashLike)
+}
+
+export function validateLike<V>(v: V) {
+  return validate<Like & V>(v, id, hashLike)
 }
 
-export function validateLike(v: unknown) {
-  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
+export function isValidLike<V>(v: V) {
+  return isValid<Like>(v, id, hashLike)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/getListFeed.ts b/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
index 6e6dfd6a9ff..f56a761022f 100644
--- a/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getListFeed'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getPostThread.ts b/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
index 53f193dd8da..245c55b9ced 100644
--- a/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getPostThread'
 
 export interface QueryParams {
@@ -23,12 +29,11 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   thread:
-    | AppBskyFeedDefs.ThreadViewPost
-    | AppBskyFeedDefs.NotFoundPost
-    | AppBskyFeedDefs.BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedDefs.ThreadViewPost>
+    | $Typed<AppBskyFeedDefs.NotFoundPost>
+    | $Typed<AppBskyFeedDefs.BlockedPost>
+    | { $type: string }
   threadgate?: AppBskyFeedDefs.ThreadgateView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getPosts.ts b/packages/api/src/client/types/app/bsky/feed/getPosts.ts
index de9aa66b6cc..6ca851e6819 100644
--- a/packages/api/src/client/types/app/bsky/feed/getPosts.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getPosts.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getPosts'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getQuotes.ts b/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
index f0cff90d5e1..4550f286646 100644
--- a/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getQuotes'
 
 export interface QueryParams {
@@ -26,7 +32,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts b/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
index 1db6626076f..1aecb6c715e 100644
--- a/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getRepostedBy'
 
 export interface QueryParams {
@@ -26,7 +32,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   repostedBy: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
index a62bed53103..0e81367ec1c 100644
--- a/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getSuggestedFeeds'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getTimeline.ts b/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
index b5a6032028c..08135f639aa 100644
--- a/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getTimeline'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/like.ts b/packages/api/src/client/types/app/bsky/feed/like.ts
index 1d0402a3288..08ede56a096 100644
--- a/packages/api/src/client/types/app/bsky/feed/like.ts
+++ b/packages/api/src/client/types/app/bsky/feed/like.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.like'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.like', 'main'>
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.like', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/post.ts b/packages/api/src/client/types/app/bsky/feed/post.ts
index 4621ad0dc10..8fcd72f9ac9 100644
--- a/packages/api/src/client/types/app/bsky/feed/post.ts
+++ b/packages/api/src/client/types/app/bsky/feed/post.ts
@@ -3,20 +3,27 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyEmbedImages from '../embed/images'
+import type * as AppBskyEmbedVideo from '../embed/video'
+import type * as AppBskyEmbedExternal from '../embed/external'
+import type * as AppBskyEmbedRecord from '../embed/record'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.post'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.post', 'main'>
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
   /** DEPRECATED: replaced by app.bsky.richtext.facet. */
@@ -25,17 +32,15 @@ export interface Record {
   facets?: AppBskyRichtextFacet.Main[]
   reply?: ReplyRef
   embed?:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | AppBskyEmbedRecord.Main
-    | AppBskyEmbedRecordWithMedia.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | $Typed<AppBskyEmbedRecord.Main>
+    | $Typed<AppBskyEmbedRecordWithMedia.Main>
+    | { $type: string }
   /** Indicates human language of post primary text content. */
   langs?: string[]
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   /** Additional hashtags, in addition to any included in post text and facets. */
   tags?: string[]
   /** Client-declared timestamp when this post was originally created. */
@@ -43,64 +48,80 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.post', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 export interface ReplyRef {
+  $type?: $Type<'app.bsky.feed.post', 'replyRef'>
   root: ComAtprotoRepoStrongRef.Main
   parent: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isReplyRef(
-  v: unknown,
-): v is ReplyRef & { $type: $Type<'app.bsky.feed.post', 'replyRef'> } {
-  return is$typed(v, id, 'replyRef')
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
+}
+
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown) {
-  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
+export function isValidReplyRef<V>(v: V) {
+  return isValid<ReplyRef>(v, id, hashReplyRef)
 }
 
 /** Deprecated: use facets instead. */
 export interface Entity {
+  $type?: $Type<'app.bsky.feed.post', 'entity'>
   index: TextSlice
   /** Expected values are 'mention' and 'link'. */
   type: string
   value: string
-  [k: string]: unknown
 }
 
-export function isEntity(
-  v: unknown,
-): v is Entity & { $type: $Type<'app.bsky.feed.post', 'entity'> } {
-  return is$typed(v, id, 'entity')
+const hashEntity = 'entity'
+
+export function isEntity<V>(v: V) {
+  return is$typed(v, id, hashEntity)
+}
+
+export function validateEntity<V>(v: V) {
+  return validate<Entity & V>(v, id, hashEntity)
 }
 
-export function validateEntity(v: unknown) {
-  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
+export function isValidEntity<V>(v: V) {
+  return isValid<Entity>(v, id, hashEntity)
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
 export interface TextSlice {
+  $type?: $Type<'app.bsky.feed.post', 'textSlice'>
   start: number
   end: number
-  [k: string]: unknown
 }
 
-export function isTextSlice(
-  v: unknown,
-): v is TextSlice & { $type: $Type<'app.bsky.feed.post', 'textSlice'> } {
-  return is$typed(v, id, 'textSlice')
+const hashTextSlice = 'textSlice'
+
+export function isTextSlice<V>(v: V) {
+  return is$typed(v, id, hashTextSlice)
+}
+
+export function validateTextSlice<V>(v: V) {
+  return validate<TextSlice & V>(v, id, hashTextSlice)
 }
 
-export function validateTextSlice(v: unknown) {
-  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
+export function isValidTextSlice<V>(v: V) {
+  return isValid<TextSlice>(v, id, hashTextSlice)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/postgate.ts b/packages/api/src/client/types/app/bsky/feed/postgate.ts
index bf7e40a70fa..25e9d32ff8c 100644
--- a/packages/api/src/client/types/app/bsky/feed/postgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/postgate.ts
@@ -3,47 +3,57 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.postgate'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.postgate', 'main'>
   createdAt: string
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
-  embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
+  embeddingRules?: ($Typed<DisableRule> | { $type: string })[]
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.postgate', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 /** Disables embedding of this post. */
 export interface DisableRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.postgate', 'disableRule'>
+}
+
+const hashDisableRule = 'disableRule'
+
+export function isDisableRule<V>(v: V) {
+  return is$typed(v, id, hashDisableRule)
 }
 
-export function isDisableRule(
-  v: unknown,
-): v is DisableRule & {
-  $type: $Type<'app.bsky.feed.postgate', 'disableRule'>
-} {
-  return is$typed(v, id, 'disableRule')
+export function validateDisableRule<V>(v: V) {
+  return validate<DisableRule & V>(v, id, hashDisableRule)
 }
 
-export function validateDisableRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#disableRule`,
-    v,
-  ) as ValidationResult<DisableRule>
+export function isValidDisableRule<V>(v: V) {
+  return isValid<DisableRule>(v, id, hashDisableRule)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/repost.ts b/packages/api/src/client/types/app/bsky/feed/repost.ts
index e602112d344..f51561588c7 100644
--- a/packages/api/src/client/types/app/bsky/feed/repost.ts
+++ b/packages/api/src/client/types/app/bsky/feed/repost.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.repost'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.repost', 'main'>
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.repost', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/searchPosts.ts b/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
index d7d170af694..c945c5f284a 100644
--- a/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
+++ b/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.searchPosts'
 
 export interface QueryParams {
@@ -43,7 +49,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts b/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
index 63701c701b4..63a8d1abe5a 100644
--- a/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
@@ -4,22 +4,25 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.sendInteractions'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   interactions: AppBskyFeedDefs.Interaction[]
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface CallOptions {
   signal?: AbortSignal
diff --git a/packages/api/src/client/types/app/bsky/feed/threadgate.ts b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
index a679c24f9cd..eefa35a8dab 100644
--- a/packages/api/src/client/types/app/bsky/feed/threadgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
@@ -3,19 +3,26 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.threadgate', 'main'>
   /** Reference (AT-URI) to the post record. */
   post: string
   allow?: (
-    | MentionRule
-    | FollowingRule
-    | ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MentionRule>
+    | $Typed<FollowingRule>
+    | $Typed<ListRule>
+    | { $type: string }
   )[]
   createdAt: string
   /** List of hidden reply URIs. */
@@ -23,68 +30,74 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.threadgate', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 /** Allow replies from actors mentioned in your post. */
 export interface MentionRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
 }
 
-export function isMentionRule(
-  v: unknown,
-): v is MentionRule & {
-  $type: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
-} {
-  return is$typed(v, id, 'mentionRule')
+const hashMentionRule = 'mentionRule'
+
+export function isMentionRule<V>(v: V) {
+  return is$typed(v, id, hashMentionRule)
+}
+
+export function validateMentionRule<V>(v: V) {
+  return validate<MentionRule & V>(v, id, hashMentionRule)
 }
 
-export function validateMentionRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#mentionRule`,
-    v,
-  ) as ValidationResult<MentionRule>
+export function isValidMentionRule<V>(v: V) {
+  return isValid<MentionRule>(v, id, hashMentionRule)
 }
 
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.threadgate', 'followingRule'>
 }
 
-export function isFollowingRule(
-  v: unknown,
-): v is FollowingRule & {
-  $type: $Type<'app.bsky.feed.threadgate', 'followingRule'>
-} {
-  return is$typed(v, id, 'followingRule')
+const hashFollowingRule = 'followingRule'
+
+export function isFollowingRule<V>(v: V) {
+  return is$typed(v, id, hashFollowingRule)
+}
+
+export function validateFollowingRule<V>(v: V) {
+  return validate<FollowingRule & V>(v, id, hashFollowingRule)
 }
 
-export function validateFollowingRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#followingRule`,
-    v,
-  ) as ValidationResult<FollowingRule>
+export function isValidFollowingRule<V>(v: V) {
+  return isValid<FollowingRule>(v, id, hashFollowingRule)
 }
 
 /** Allow replies from actors on a list. */
 export interface ListRule {
+  $type?: $Type<'app.bsky.feed.threadgate', 'listRule'>
   list: string
-  [k: string]: unknown
 }
 
-export function isListRule(
-  v: unknown,
-): v is ListRule & { $type: $Type<'app.bsky.feed.threadgate', 'listRule'> } {
-  return is$typed(v, id, 'listRule')
+const hashListRule = 'listRule'
+
+export function isListRule<V>(v: V) {
+  return is$typed(v, id, hashListRule)
+}
+
+export function validateListRule<V>(v: V) {
+  return validate<ListRule & V>(v, id, hashListRule)
 }
 
-export function validateListRule(v: unknown) {
-  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
+export function isValidListRule<V>(v: V) {
+  return isValid<ListRule>(v, id, hashListRule)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/block.ts b/packages/api/src/client/types/app/bsky/graph/block.ts
index 4bc5a5f3038..c10702a4403 100644
--- a/packages/api/src/client/types/app/bsky/graph/block.ts
+++ b/packages/api/src/client/types/app/bsky/graph/block.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.block'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.block', 'main'>
   /** DID of the account to be blocked. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.block', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/defs.ts b/packages/api/src/client/types/app/bsky/graph/defs.ts
index 90921996adc..52c8471a7d8 100644
--- a/packages/api/src/client/types/app/bsky/graph/defs.ts
+++ b/packages/api/src/client/types/app/bsky/graph/defs.ts
@@ -3,16 +3,23 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyFeedDefs from '../feed/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyFeedDefs from '../feed/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.defs'
 
 export interface ListViewBasic {
+  $type?: $Type<'app.bsky.graph.defs', 'listViewBasic'>
   uri: string
   cid: string
   name: string
@@ -22,25 +29,24 @@ export interface ListViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt?: string
-  [k: string]: unknown
 }
 
-export function isListViewBasic(
-  v: unknown,
-): v is ListViewBasic & {
-  $type: $Type<'app.bsky.graph.defs', 'listViewBasic'>
-} {
-  return is$typed(v, id, 'listViewBasic')
+const hashListViewBasic = 'listViewBasic'
+
+export function isListViewBasic<V>(v: V) {
+  return is$typed(v, id, hashListViewBasic)
+}
+
+export function validateListViewBasic<V>(v: V) {
+  return validate<ListViewBasic & V>(v, id, hashListViewBasic)
 }
 
-export function validateListViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#listViewBasic`,
-    v,
-  ) as ValidationResult<ListViewBasic>
+export function isValidListViewBasic<V>(v: V) {
+  return isValid<ListViewBasic>(v, id, hashListViewBasic)
 }
 
 export interface ListView {
+  $type?: $Type<'app.bsky.graph.defs', 'listView'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -53,42 +59,47 @@ export interface ListView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isListView(
-  v: unknown,
-): v is ListView & { $type: $Type<'app.bsky.graph.defs', 'listView'> } {
-  return is$typed(v, id, 'listView')
+const hashListView = 'listView'
+
+export function isListView<V>(v: V) {
+  return is$typed(v, id, hashListView)
+}
+
+export function validateListView<V>(v: V) {
+  return validate<ListView & V>(v, id, hashListView)
 }
 
-export function validateListView(v: unknown) {
-  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
+export function isValidListView<V>(v: V) {
+  return isValid<ListView>(v, id, hashListView)
 }
 
 export interface ListItemView {
+  $type?: $Type<'app.bsky.graph.defs', 'listItemView'>
   uri: string
   subject: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isListItemView(
-  v: unknown,
-): v is ListItemView & { $type: $Type<'app.bsky.graph.defs', 'listItemView'> } {
-  return is$typed(v, id, 'listItemView')
+const hashListItemView = 'listItemView'
+
+export function isListItemView<V>(v: V) {
+  return is$typed(v, id, hashListItemView)
+}
+
+export function validateListItemView<V>(v: V) {
+  return validate<ListItemView & V>(v, id, hashListItemView)
 }
 
-export function validateListItemView(v: unknown) {
-  return lexicons.validate(
-    `${id}#listItemView`,
-    v,
-  ) as ValidationResult<ListItemView>
+export function isValidListItemView<V>(v: V) {
+  return isValid<ListItemView>(v, id, hashListItemView)
 }
 
 export interface StarterPackView {
+  $type?: $Type<'app.bsky.graph.defs', 'starterPackView'>
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   list?: ListViewBasic
   listItemsSample?: ListItemView[]
@@ -97,50 +108,47 @@ export interface StarterPackView {
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackView(
-  v: unknown,
-): v is StarterPackView & {
-  $type: $Type<'app.bsky.graph.defs', 'starterPackView'>
-} {
-  return is$typed(v, id, 'starterPackView')
+const hashStarterPackView = 'starterPackView'
+
+export function isStarterPackView<V>(v: V) {
+  return is$typed(v, id, hashStarterPackView)
+}
+
+export function validateStarterPackView<V>(v: V) {
+  return validate<StarterPackView & V>(v, id, hashStarterPackView)
 }
 
-export function validateStarterPackView(v: unknown) {
-  return lexicons.validate(
-    `${id}#starterPackView`,
-    v,
-  ) as ValidationResult<StarterPackView>
+export function isValidStarterPackView<V>(v: V) {
+  return isValid<StarterPackView>(v, id, hashStarterPackView)
 }
 
 export interface StarterPackViewBasic {
+  $type?: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   listItemCount?: number
   joinedWeekCount?: number
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(
-  v: unknown,
-): v is StarterPackViewBasic & {
-  $type: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
-} {
-  return is$typed(v, id, 'starterPackViewBasic')
+const hashStarterPackViewBasic = 'starterPackViewBasic'
+
+export function isStarterPackViewBasic<V>(v: V) {
+  return is$typed(v, id, hashStarterPackViewBasic)
+}
+
+export function validateStarterPackViewBasic<V>(v: V) {
+  return validate<StarterPackViewBasic & V>(v, id, hashStarterPackViewBasic)
 }
 
-export function validateStarterPackViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#starterPackViewBasic`,
-    v,
-  ) as ValidationResult<StarterPackViewBasic>
+export function isValidStarterPackViewBasic<V>(v: V) {
+  return isValid<StarterPackViewBasic>(v, id, hashStarterPackViewBasic)
 }
 
 export type ListPurpose =
@@ -157,67 +165,66 @@ export const CURATELIST = `${id}#curatelist`
 export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
+  $type?: $Type<'app.bsky.graph.defs', 'listViewerState'>
   muted?: boolean
   blocked?: string
-  [k: string]: unknown
 }
 
-export function isListViewerState(
-  v: unknown,
-): v is ListViewerState & {
-  $type: $Type<'app.bsky.graph.defs', 'listViewerState'>
-} {
-  return is$typed(v, id, 'listViewerState')
+const hashListViewerState = 'listViewerState'
+
+export function isListViewerState<V>(v: V) {
+  return is$typed(v, id, hashListViewerState)
+}
+
+export function validateListViewerState<V>(v: V) {
+  return validate<ListViewerState & V>(v, id, hashListViewerState)
 }
 
-export function validateListViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#listViewerState`,
-    v,
-  ) as ValidationResult<ListViewerState>
+export function isValidListViewerState<V>(v: V) {
+  return isValid<ListViewerState>(v, id, hashListViewerState)
 }
 
 /** indicates that a handle or DID could not be resolved */
 export interface NotFoundActor {
+  $type?: $Type<'app.bsky.graph.defs', 'notFoundActor'>
   actor: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundActor(
-  v: unknown,
-): v is NotFoundActor & {
-  $type: $Type<'app.bsky.graph.defs', 'notFoundActor'>
-} {
-  return is$typed(v, id, 'notFoundActor')
+const hashNotFoundActor = 'notFoundActor'
+
+export function isNotFoundActor<V>(v: V) {
+  return is$typed(v, id, hashNotFoundActor)
+}
+
+export function validateNotFoundActor<V>(v: V) {
+  return validate<NotFoundActor & V>(v, id, hashNotFoundActor)
 }
 
-export function validateNotFoundActor(v: unknown) {
-  return lexicons.validate(
-    `${id}#notFoundActor`,
-    v,
-  ) as ValidationResult<NotFoundActor>
+export function isValidNotFoundActor<V>(v: V) {
+  return isValid<NotFoundActor>(v, id, hashNotFoundActor)
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
 export interface Relationship {
+  $type?: $Type<'app.bsky.graph.defs', 'relationship'>
   did: string
   /** if the actor follows this DID, this is the AT-URI of the follow record */
   following?: string
   /** if the actor is followed by this DID, contains the AT-URI of the follow record */
   followedBy?: string
-  [k: string]: unknown
 }
 
-export function isRelationship(
-  v: unknown,
-): v is Relationship & { $type: $Type<'app.bsky.graph.defs', 'relationship'> } {
-  return is$typed(v, id, 'relationship')
+const hashRelationship = 'relationship'
+
+export function isRelationship<V>(v: V) {
+  return is$typed(v, id, hashRelationship)
+}
+
+export function validateRelationship<V>(v: V) {
+  return validate<Relationship & V>(v, id, hashRelationship)
 }
 
-export function validateRelationship(v: unknown) {
-  return lexicons.validate(
-    `${id}#relationship`,
-    v,
-  ) as ValidationResult<Relationship>
+export function isValidRelationship<V>(v: V) {
+  return isValid<Relationship>(v, id, hashRelationship)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/follow.ts b/packages/api/src/client/types/app/bsky/graph/follow.ts
index cd7728fdd18..28c81906d31 100644
--- a/packages/api/src/client/types/app/bsky/graph/follow.ts
+++ b/packages/api/src/client/types/app/bsky/graph/follow.ts
@@ -3,23 +3,34 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.follow'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.follow', 'main'>
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.follow', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts b/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
index 0d56a3536d0..9de0f733842 100644
--- a/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyGraphDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getActorStarterPacks'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getBlocks.ts b/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
index 7858841eb61..a0331c45abc 100644
--- a/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getBlocks'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blocks: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getFollowers.ts b/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
index 3d4121bc0a7..0c1ca06b069 100644
--- a/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getFollowers'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getFollows.ts b/packages/api/src/client/types/app/bsky/graph/getFollows.ts
index 75b05d1c513..929b139cba2 100644
--- a/packages/api/src/client/types/app/bsky/graph/getFollows.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getFollows.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getFollows'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   follows: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts b/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
index 24dfd79f3ab..698596e78bd 100644
--- a/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getKnownFollowers'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getList.ts b/packages/api/src/client/types/app/bsky/graph/getList.ts
index 89bc0eeacb9..1f8a98fc7d1 100644
--- a/packages/api/src/client/types/app/bsky/graph/getList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getList.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyGraphDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getList'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   cursor?: string
   list: AppBskyGraphDefs.ListView
   items: AppBskyGraphDefs.ListItemView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts b/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
index 0be93d089f6..70868b61ea8 100644
--- a/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyGraphDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getListBlocks'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getListMutes.ts b/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
index e377ac14d7a..009957651a4 100644
--- a/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyGraphDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getListMutes'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getLists.ts b/packages/api/src/client/types/app/bsky/graph/getLists.ts
index 6cae28caa98..e4d619929e8 100644
--- a/packages/api/src/client/types/app/bsky/graph/getLists.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getLists.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyGraphDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getLists'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getMutes.ts b/packages/api/src/client/types/app/bsky/graph/getMutes.ts
index a3708bdc5e9..5ca4d20ced6 100644
--- a/packages/api/src/client/types/app/bsky/graph/getMutes.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getMutes.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getMutes'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   mutes: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getRelationships.ts b/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
index fba7825bdfb..cf014538efc 100644
--- a/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyGraphDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getRelationships'
 
 export interface QueryParams {
@@ -22,11 +28,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   actor?: string
   relationships: (
-    | AppBskyGraphDefs.Relationship
-    | AppBskyGraphDefs.NotFoundActor
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyGraphDefs.Relationship>
+    | $Typed<AppBskyGraphDefs.NotFoundActor>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts b/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
index c29073c7e8a..9ada3286741 100644
--- a/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyGraphDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getStarterPack'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPack: AppBskyGraphDefs.StarterPackView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts b/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
index d1c2df237b4..3ac4ba0fb14 100644
--- a/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyGraphDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getStarterPacks'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index b3df5a5e9c8..b7a3b754c11 100644
--- a/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getSuggestedFollowsByActor'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export interface OutputSchema {
   suggestions: AppBskyActorDefs.ProfileView[]
   /** If true, response has fallen-back to generic results, and is not scoped using relativeToDid */
   isFallback: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/list.ts b/packages/api/src/client/types/app/bsky/graph/list.ts
index f1e242d1661..97bf1c00559 100644
--- a/packages/api/src/client/types/app/bsky/graph/list.ts
+++ b/packages/api/src/client/types/app/bsky/graph/list.ts
@@ -3,34 +3,43 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyGraphDefs from './defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.list'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.list', 'main'>
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
   name: string
   description?: string
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.list', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/listblock.ts b/packages/api/src/client/types/app/bsky/graph/listblock.ts
index ede600c112c..6ebd36c4cb3 100644
--- a/packages/api/src/client/types/app/bsky/graph/listblock.ts
+++ b/packages/api/src/client/types/app/bsky/graph/listblock.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.listblock'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.listblock', 'main'>
   /** Reference (AT-URI) to the mod list record. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.listblock', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/listitem.ts b/packages/api/src/client/types/app/bsky/graph/listitem.ts
index 0a1a4590db6..a3b7efb0eb1 100644
--- a/packages/api/src/client/types/app/bsky/graph/listitem.ts
+++ b/packages/api/src/client/types/app/bsky/graph/listitem.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.listitem'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.listitem', 'main'>
   /** The account which is included on the list. */
   subject: string
   /** Reference (AT-URI) to the list record (app.bsky.graph.list). */
@@ -17,12 +24,16 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.listitem', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/muteActor.ts b/packages/api/src/client/types/app/bsky/graph/muteActor.ts
index 18fbd027e53..f3580483cf3 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteActor.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteActor'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/muteActorList.ts b/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
index 6da99862d1c..371563d2193 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteActorList'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/muteThread.ts b/packages/api/src/client/types/app/bsky/graph/muteThread.ts
index 1dde979bbbc..a99cb101c9e 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteThread.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteThread.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteThread'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts b/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts
index 10c89a85b0b..cb683571f07 100644
--- a/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyGraphDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.searchStarterPacks'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/starterpack.ts b/packages/api/src/client/types/app/bsky/graph/starterpack.ts
index 7466af55782..66abf07fd50 100644
--- a/packages/api/src/client/types/app/bsky/graph/starterpack.ts
+++ b/packages/api/src/client/types/app/bsky/graph/starterpack.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyRichtextFacet from '../richtext/facet'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.starterpack'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.starterpack', 'main'>
   /** Display name for starter pack; can not be empty. */
   name: string
   description?: string
@@ -21,27 +28,35 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.starterpack', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 export interface FeedItem {
+  $type?: $Type<'app.bsky.graph.starterpack', 'feedItem'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeedItem(
-  v: unknown,
-): v is FeedItem & { $type: $Type<'app.bsky.graph.starterpack', 'feedItem'> } {
-  return is$typed(v, id, 'feedItem')
+const hashFeedItem = 'feedItem'
+
+export function isFeedItem<V>(v: V) {
+  return is$typed(v, id, hashFeedItem)
+}
+
+export function validateFeedItem<V>(v: V) {
+  return validate<FeedItem & V>(v, id, hashFeedItem)
 }
 
-export function validateFeedItem(v: unknown) {
-  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
+export function isValidFeedItem<V>(v: V) {
+  return isValid<FeedItem>(v, id, hashFeedItem)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts b/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
index 0cb4970f37d..548a2ad0cf1 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteActor'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts b/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
index f866d0d6cdd..1be31921fd9 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteActorList'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts b/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
index 25b03006f27..657c17c949a 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteThread'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/labeler/defs.ts b/packages/api/src/client/types/app/bsky/labeler/defs.ts
index 50a5302866e..e0f2f945b4e 100644
--- a/packages/api/src/client/types/app/bsky/labeler/defs.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/defs.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.defs'
 
 export interface LabelerView {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerView'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -18,23 +25,24 @@ export interface LabelerView {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerView(
-  v: unknown,
-): v is LabelerView & { $type: $Type<'app.bsky.labeler.defs', 'labelerView'> } {
-  return is$typed(v, id, 'labelerView')
+const hashLabelerView = 'labelerView'
+
+export function isLabelerView<V>(v: V) {
+  return is$typed(v, id, hashLabelerView)
+}
+
+export function validateLabelerView<V>(v: V) {
+  return validate<LabelerView & V>(v, id, hashLabelerView)
 }
 
-export function validateLabelerView(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerView`,
-    v,
-  ) as ValidationResult<LabelerView>
+export function isValidLabelerView<V>(v: V) {
+  return isValid<LabelerView>(v, id, hashLabelerView)
 }
 
 export interface LabelerViewDetailed {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -43,63 +51,59 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(
-  v: unknown,
-): v is LabelerViewDetailed & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
-} {
-  return is$typed(v, id, 'labelerViewDetailed')
+const hashLabelerViewDetailed = 'labelerViewDetailed'
+
+export function isLabelerViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewDetailed)
+}
+
+export function validateLabelerViewDetailed<V>(v: V) {
+  return validate<LabelerViewDetailed & V>(v, id, hashLabelerViewDetailed)
 }
 
-export function validateLabelerViewDetailed(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerViewDetailed`,
-    v,
-  ) as ValidationResult<LabelerViewDetailed>
+export function isValidLabelerViewDetailed<V>(v: V) {
+  return isValid<LabelerViewDetailed>(v, id, hashLabelerViewDetailed)
 }
 
 export interface LabelerViewerState {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
   like?: string
-  [k: string]: unknown
 }
 
-export function isLabelerViewerState(
-  v: unknown,
-): v is LabelerViewerState & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
-} {
-  return is$typed(v, id, 'labelerViewerState')
+const hashLabelerViewerState = 'labelerViewerState'
+
+export function isLabelerViewerState<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewerState)
+}
+
+export function validateLabelerViewerState<V>(v: V) {
+  return validate<LabelerViewerState & V>(v, id, hashLabelerViewerState)
 }
 
-export function validateLabelerViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerViewerState`,
-    v,
-  ) as ValidationResult<LabelerViewerState>
+export function isValidLabelerViewerState<V>(v: V) {
+  return isValid<LabelerViewerState>(v, id, hashLabelerViewerState)
 }
 
 export interface LabelerPolicies {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
   /** The label values which this labeler publishes. May include global or custom labels. */
   labelValues: ComAtprotoLabelDefs.LabelValue[]
   /** Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. */
   labelValueDefinitions?: ComAtprotoLabelDefs.LabelValueDefinition[]
-  [k: string]: unknown
 }
 
-export function isLabelerPolicies(
-  v: unknown,
-): v is LabelerPolicies & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
-} {
-  return is$typed(v, id, 'labelerPolicies')
+const hashLabelerPolicies = 'labelerPolicies'
+
+export function isLabelerPolicies<V>(v: V) {
+  return is$typed(v, id, hashLabelerPolicies)
+}
+
+export function validateLabelerPolicies<V>(v: V) {
+  return validate<LabelerPolicies & V>(v, id, hashLabelerPolicies)
 }
 
-export function validateLabelerPolicies(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerPolicies`,
-    v,
-  ) as ValidationResult<LabelerPolicies>
+export function isValidLabelerPolicies<V>(v: V) {
+  return isValid<LabelerPolicies>(v, id, hashLabelerPolicies)
 }
diff --git a/packages/api/src/client/types/app/bsky/labeler/getServices.ts b/packages/api/src/client/types/app/bsky/labeler/getServices.ts
index 418dd8e906e..07a694b8b9c 100644
--- a/packages/api/src/client/types/app/bsky/labeler/getServices.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/getServices.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyLabelerDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.getServices'
 
 export interface QueryParams {
@@ -19,11 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   views: (
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyLabelerDefs.LabelerViewDetailed>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/labeler/service.ts b/packages/api/src/client/types/app/bsky/labeler/service.ts
index 347645730d0..5973c2fd285 100644
--- a/packages/api/src/client/types/app/bsky/labeler/service.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/service.ts
@@ -3,28 +3,37 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyLabelerDefs from './defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.service'
 
 export interface Record {
+  $type?: $Type<'app.bsky.labeler.service', 'main'>
   policies: AppBskyLabelerDefs.LabelerPolicies
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.labeler.service', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts b/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
index b39aec7880a..2684ce1b6bf 100644
--- a/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.getUnreadCount'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   count: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/notification/listNotifications.ts b/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
index b2b2bfdf5f7..ffd554e9af0 100644
--- a/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
+++ b/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
@@ -4,11 +4,17 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.listNotifications'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   notifications: Notification[]
   priority?: boolean
   seenAt?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -46,6 +51,7 @@ export function toKnownErr(e: any) {
 }
 
 export interface Notification {
+  $type?: $Type<'app.bsky.notification.listNotifications', 'notification'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileView
@@ -60,24 +66,22 @@ export interface Notification {
     | 'starterpack-joined'
     | (string & {})
   reasonSubject?: string
-  record: {}
+  record: { [_ in string]: unknown }
   isRead: boolean
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isNotification(
-  v: unknown,
-): v is Notification & {
-  $type: $Type<'app.bsky.notification.listNotifications', 'notification'>
-} {
-  return is$typed(v, id, 'notification')
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
+}
+
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
 }
 
-export function validateNotification(v: unknown) {
-  return lexicons.validate(
-    `${id}#notification`,
-    v,
-  ) as ValidationResult<Notification>
+export function isValidNotification<V>(v: V) {
+  return isValid<Notification>(v, id, hashNotification)
 }
diff --git a/packages/api/src/client/types/app/bsky/notification/putPreferences.ts b/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
index 507528b2e05..b1a0ec01752 100644
--- a/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   priority: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/notification/registerPush.ts b/packages/api/src/client/types/app/bsky/notification/registerPush.ts
index 65f40b64633..a3091791f85 100644
--- a/packages/api/src/client/types/app/bsky/notification/registerPush.ts
+++ b/packages/api/src/client/types/app/bsky/notification/registerPush.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.registerPush'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   token: string
   platform: 'ios' | 'android' | 'web' | (string & {})
   appId: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/notification/updateSeen.ts b/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
index eaa486ee2f4..6085286804a 100644
--- a/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
+++ b/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.updateSeen'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   seenAt: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/richtext/facet.ts b/packages/api/src/client/types/app/bsky/richtext/facet.ts
index 56d2aebb4cd..a73bef3f85a 100644
--- a/packages/api/src/client/types/app/bsky/richtext/facet.ts
+++ b/packages/api/src/client/types/app/bsky/richtext/facet.ts
@@ -3,89 +3,115 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
+  $type?: $Type<'app.bsky.richtext.facet', 'main'>
   index: ByteSlice
-  features: (Mention | Link | Tag | { $type: string; [k: string]: unknown })[]
-  [k: string]: unknown
+  features: ($Typed<Mention> | $Typed<Link> | $Typed<Tag> | { $type: string })[]
+}
+
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.richtext.facet', 'main'> } {
-  return is$typed(v, id, 'main')
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
 export interface Mention {
+  $type?: $Type<'app.bsky.richtext.facet', 'mention'>
   did: string
-  [k: string]: unknown
 }
 
-export function isMention(
-  v: unknown,
-): v is Mention & { $type: $Type<'app.bsky.richtext.facet', 'mention'> } {
-  return is$typed(v, id, 'mention')
+const hashMention = 'mention'
+
+export function isMention<V>(v: V) {
+  return is$typed(v, id, hashMention)
+}
+
+export function validateMention<V>(v: V) {
+  return validate<Mention & V>(v, id, hashMention)
 }
 
-export function validateMention(v: unknown) {
-  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
+export function isValidMention<V>(v: V) {
+  return isValid<Mention>(v, id, hashMention)
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
 export interface Link {
+  $type?: $Type<'app.bsky.richtext.facet', 'link'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isLink(
-  v: unknown,
-): v is Link & { $type: $Type<'app.bsky.richtext.facet', 'link'> } {
-  return is$typed(v, id, 'link')
+const hashLink = 'link'
+
+export function isLink<V>(v: V) {
+  return is$typed(v, id, hashLink)
+}
+
+export function validateLink<V>(v: V) {
+  return validate<Link & V>(v, id, hashLink)
 }
 
-export function validateLink(v: unknown) {
-  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
+export function isValidLink<V>(v: V) {
+  return isValid<Link>(v, id, hashLink)
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
 export interface Tag {
+  $type?: $Type<'app.bsky.richtext.facet', 'tag'>
   tag: string
-  [k: string]: unknown
 }
 
-export function isTag(
-  v: unknown,
-): v is Tag & { $type: $Type<'app.bsky.richtext.facet', 'tag'> } {
-  return is$typed(v, id, 'tag')
+const hashTag = 'tag'
+
+export function isTag<V>(v: V) {
+  return is$typed(v, id, hashTag)
+}
+
+export function validateTag<V>(v: V) {
+  return validate<Tag & V>(v, id, hashTag)
 }
 
-export function validateTag(v: unknown) {
-  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
+export function isValidTag<V>(v: V) {
+  return isValid<Tag>(v, id, hashTag)
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
 export interface ByteSlice {
+  $type?: $Type<'app.bsky.richtext.facet', 'byteSlice'>
   byteStart: number
   byteEnd: number
-  [k: string]: unknown
 }
 
-export function isByteSlice(
-  v: unknown,
-): v is ByteSlice & { $type: $Type<'app.bsky.richtext.facet', 'byteSlice'> } {
-  return is$typed(v, id, 'byteSlice')
+const hashByteSlice = 'byteSlice'
+
+export function isByteSlice<V>(v: V) {
+  return is$typed(v, id, hashByteSlice)
+}
+
+export function validateByteSlice<V>(v: V) {
+  return validate<ByteSlice & V>(v, id, hashByteSlice)
 }
 
-export function validateByteSlice(v: unknown) {
-  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
+export function isValidByteSlice<V>(v: V) {
+  return isValid<ByteSlice>(v, id, hashByteSlice)
 }
diff --git a/packages/api/src/client/types/app/bsky/unspecced/defs.ts b/packages/api/src/client/types/app/bsky/unspecced/defs.ts
index 1459a765dbf..a4286c5222e 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/defs.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/defs.ts
@@ -3,90 +3,100 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(
-  v: unknown,
-): v is SkeletonSearchPost & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
-} {
-  return is$typed(v, id, 'skeletonSearchPost')
+const hashSkeletonSearchPost = 'skeletonSearchPost'
+
+export function isSkeletonSearchPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchPost)
 }
 
-export function validateSkeletonSearchPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchPost`,
-    v,
-  ) as ValidationResult<SkeletonSearchPost>
+export function validateSkeletonSearchPost<V>(v: V) {
+  return validate<SkeletonSearchPost & V>(v, id, hashSkeletonSearchPost)
+}
+
+export function isValidSkeletonSearchPost<V>(v: V) {
+  return isValid<SkeletonSearchPost>(v, id, hashSkeletonSearchPost)
 }
 
 export interface SkeletonSearchActor {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
   did: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(
-  v: unknown,
-): v is SkeletonSearchActor & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
-} {
-  return is$typed(v, id, 'skeletonSearchActor')
+const hashSkeletonSearchActor = 'skeletonSearchActor'
+
+export function isSkeletonSearchActor<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchActor)
 }
 
-export function validateSkeletonSearchActor(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchActor`,
-    v,
-  ) as ValidationResult<SkeletonSearchActor>
+export function validateSkeletonSearchActor<V>(v: V) {
+  return validate<SkeletonSearchActor & V>(v, id, hashSkeletonSearchActor)
+}
+
+export function isValidSkeletonSearchActor<V>(v: V) {
+  return isValid<SkeletonSearchActor>(v, id, hashSkeletonSearchActor)
 }
 
 export interface SkeletonSearchStarterPack {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchStarterPack(
-  v: unknown,
-): v is SkeletonSearchStarterPack & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
-} {
-  return is$typed(v, id, 'skeletonSearchStarterPack')
+const hashSkeletonSearchStarterPack = 'skeletonSearchStarterPack'
+
+export function isSkeletonSearchStarterPack<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchStarterPack)
+}
+
+export function validateSkeletonSearchStarterPack<V>(v: V) {
+  return validate<SkeletonSearchStarterPack & V>(
+    v,
+    id,
+    hashSkeletonSearchStarterPack,
+  )
 }
 
-export function validateSkeletonSearchStarterPack(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchStarterPack`,
+export function isValidSkeletonSearchStarterPack<V>(v: V) {
+  return isValid<SkeletonSearchStarterPack>(
     v,
-  ) as ValidationResult<SkeletonSearchStarterPack>
+    id,
+    hashSkeletonSearchStarterPack,
+  )
 }
 
 export interface TrendingTopic {
+  $type?: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
   topic: string
   displayName?: string
   description?: string
   link: string
-  [k: string]: unknown
 }
 
-export function isTrendingTopic(
-  v: unknown,
-): v is TrendingTopic & {
-  $type: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
-} {
-  return is$typed(v, id, 'trendingTopic')
+const hashTrendingTopic = 'trendingTopic'
+
+export function isTrendingTopic<V>(v: V) {
+  return is$typed(v, id, hashTrendingTopic)
 }
 
-export function validateTrendingTopic(v: unknown) {
-  return lexicons.validate(
-    `${id}#trendingTopic`,
-    v,
-  ) as ValidationResult<TrendingTopic>
+export function validateTrendingTopic<V>(v: V) {
+  return validate<TrendingTopic & V>(v, id, hashTrendingTopic)
+}
+
+export function isValidTrendingTopic<V>(v: V) {
+  return isValid<TrendingTopic>(v, id, hashTrendingTopic)
 }
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts b/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
index 0f349472146..fa9c268fe8a 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getConfig'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   checkEmailConfirmed?: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 0192a32c8f7..9435afd636f 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyFeedDefs from '../feed/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from '../feed/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getPopularFeedGenerators'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index 9df9298b22f..c503ad22335 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyUnspeccedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
 
 export interface QueryParams {
@@ -26,7 +32,6 @@ export interface OutputSchema {
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
   /** DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer. */
   relativeToDid?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
index 346ef080ca8..91baf4c1c5f 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getTaggedSuggestions'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   suggestions: Suggestion[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -34,23 +39,22 @@ export function toKnownErr(e: any) {
 }
 
 export interface Suggestion {
+  $type?: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
   tag: string
   subjectType: 'actor' | 'feed' | (string & {})
   subject: string
-  [k: string]: unknown
 }
 
-export function isSuggestion(
-  v: unknown,
-): v is Suggestion & {
-  $type: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
-} {
-  return is$typed(v, id, 'suggestion')
+const hashSuggestion = 'suggestion'
+
+export function isSuggestion<V>(v: V) {
+  return is$typed(v, id, hashSuggestion)
+}
+
+export function validateSuggestion<V>(v: V) {
+  return validate<Suggestion & V>(v, id, hashSuggestion)
 }
 
-export function validateSuggestion(v: unknown) {
-  return lexicons.validate(
-    `${id}#suggestion`,
-    v,
-  ) as ValidationResult<Suggestion>
+export function isValidSuggestion<V>(v: V) {
+  return isValid<Suggestion>(v, id, hashSuggestion)
 }
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts
index 6839bddeafe..369d41b2b35 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyUnspeccedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getTrendingTopics'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   topics: AppBskyUnspeccedDefs.TrendingTopic[]
   suggested: AppBskyUnspeccedDefs.TrendingTopic[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
index 7799158a8ec..0f501c2abf5 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyUnspeccedDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyUnspeccedDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchActorsSkeleton'
 
 export interface QueryParams {
@@ -29,7 +35,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
index 00e032f2be9..22b9501bdbb 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyUnspeccedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchPostsSkeleton'
 
 export interface QueryParams {
@@ -45,7 +51,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyUnspeccedDefs.SkeletonSearchPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index 51cb7b9e78a..d1b38953cc8 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyUnspeccedDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyUnspeccedDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   starterPacks: AppBskyUnspeccedDefs.SkeletonSearchStarterPack[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/video/defs.ts b/packages/api/src/client/types/app/bsky/video/defs.ts
index 3cf6cae3436..93ed16829ca 100644
--- a/packages/api/src/client/types/app/bsky/video/defs.ts
+++ b/packages/api/src/client/types/app/bsky/video/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
+  $type?: $Type<'app.bsky.video.defs', 'jobStatus'>
   jobId: string
   did: string
   /** The state of the video processing job. All values not listed as a known value indicate that the job is in process. */
@@ -18,15 +25,18 @@ export interface JobStatus {
   blob?: BlobRef
   error?: string
   message?: string
-  [k: string]: unknown
 }
 
-export function isJobStatus(
-  v: unknown,
-): v is JobStatus & { $type: $Type<'app.bsky.video.defs', 'jobStatus'> } {
-  return is$typed(v, id, 'jobStatus')
+const hashJobStatus = 'jobStatus'
+
+export function isJobStatus<V>(v: V) {
+  return is$typed(v, id, hashJobStatus)
+}
+
+export function validateJobStatus<V>(v: V) {
+  return validate<JobStatus & V>(v, id, hashJobStatus)
 }
 
-export function validateJobStatus(v: unknown) {
-  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
+export function isValidJobStatus<V>(v: V) {
+  return isValid<JobStatus>(v, id, hashJobStatus)
 }
diff --git a/packages/api/src/client/types/app/bsky/video/getJobStatus.ts b/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
index a303f44ed52..987c9b5544d 100644
--- a/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
+++ b/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyVideoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyVideoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.getJobStatus'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts b/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
index dc653bc87f9..a79b6be3bcc 100644
--- a/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.getUploadLimits'
 
 export interface QueryParams {}
@@ -19,7 +25,6 @@ export interface OutputSchema {
   remainingDailyBytes?: number
   message?: string
   error?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/video/uploadVideo.ts b/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
index f56dd13cec2..118be71e31d 100644
--- a/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
+++ b/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyVideoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyVideoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.uploadVideo'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/actor/declaration.ts b/packages/api/src/client/types/chat/bsky/actor/declaration.ts
index a17b0b24ffd..745d97fc50a 100644
--- a/packages/api/src/client/types/chat/bsky/actor/declaration.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/declaration.ts
@@ -3,22 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
+  $type?: $Type<'chat.bsky.actor.declaration', 'main'>
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'chat.bsky.actor.declaration', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/chat/bsky/actor/defs.ts b/packages/api/src/client/types/chat/bsky/actor/defs.ts
index e4a14d1b220..0a12bbedea1 100644
--- a/packages/api/src/client/types/chat/bsky/actor/defs.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/defs.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
   did: string
   handle: string
   displayName?: string
@@ -20,20 +27,18 @@ export interface ProfileViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   /** Set to true when the actor cannot actively participate in converations */
   chatDisabled?: boolean
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(
-  v: unknown,
-): v is ProfileViewBasic & {
-  $type: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
-} {
-  return is$typed(v, id, 'profileViewBasic')
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
+}
+
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewBasic`,
-    v,
-  ) as ValidationResult<ProfileViewBasic>
+export function isValidProfileViewBasic<V>(v: V) {
+  return isValid<ProfileViewBasic>(v, id, hashProfileViewBasic)
 }
diff --git a/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts b/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
index c96bdf96729..bc0a05dc4b3 100644
--- a/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
@@ -4,18 +4,22 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.deleteAccount'
 
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface CallOptions {
   signal?: AbortSignal
diff --git a/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts b/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
index 21d7bb32b26..21d6f936432 100644
--- a/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.exportAccountData'
 
 export interface QueryParams {}
diff --git a/packages/api/src/client/types/chat/bsky/convo/defs.ts b/packages/api/src/client/types/chat/bsky/convo/defs.ts
index e79d83b0e60..1b1a357aabc 100644
--- a/packages/api/src/client/types/chat/bsky/convo/defs.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/defs.ts
@@ -3,237 +3,236 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
-import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
-import * as ChatBskyActorDefs from '../actor/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
+import type * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
+import type * as ChatBskyActorDefs from '../actor/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.defs'
 
 export interface MessageRef {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageRef'>
   did: string
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
-export function isMessageRef(
-  v: unknown,
-): v is MessageRef & { $type: $Type<'chat.bsky.convo.defs', 'messageRef'> } {
-  return is$typed(v, id, 'messageRef')
+const hashMessageRef = 'messageRef'
+
+export function isMessageRef<V>(v: V) {
+  return is$typed(v, id, hashMessageRef)
 }
 
-export function validateMessageRef(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageRef`,
-    v,
-  ) as ValidationResult<MessageRef>
+export function validateMessageRef<V>(v: V) {
+  return validate<MessageRef & V>(v, id, hashMessageRef)
+}
+
+export function isValidMessageRef<V>(v: V) {
+  return isValid<MessageRef>(v, id, hashMessageRef)
 }
 
 export interface MessageInput {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageInput'>
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.Main | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  embed?: $Typed<AppBskyEmbedRecord.Main> | { $type: string }
 }
 
-export function isMessageInput(
-  v: unknown,
-): v is MessageInput & {
-  $type: $Type<'chat.bsky.convo.defs', 'messageInput'>
-} {
-  return is$typed(v, id, 'messageInput')
+const hashMessageInput = 'messageInput'
+
+export function isMessageInput<V>(v: V) {
+  return is$typed(v, id, hashMessageInput)
 }
 
-export function validateMessageInput(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageInput`,
-    v,
-  ) as ValidationResult<MessageInput>
+export function validateMessageInput<V>(v: V) {
+  return validate<MessageInput & V>(v, id, hashMessageInput)
+}
+
+export function isValidMessageInput<V>(v: V) {
+  return isValid<MessageInput>(v, id, hashMessageInput)
 }
 
 export interface MessageView {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageView'>
   id: string
   rev: string
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.View | { $type: string; [k: string]: unknown }
+  embed?: $Typed<AppBskyEmbedRecord.View> | { $type: string }
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isMessageView(
-  v: unknown,
-): v is MessageView & { $type: $Type<'chat.bsky.convo.defs', 'messageView'> } {
-  return is$typed(v, id, 'messageView')
+const hashMessageView = 'messageView'
+
+export function isMessageView<V>(v: V) {
+  return is$typed(v, id, hashMessageView)
+}
+
+export function validateMessageView<V>(v: V) {
+  return validate<MessageView & V>(v, id, hashMessageView)
 }
 
-export function validateMessageView(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageView`,
-    v,
-  ) as ValidationResult<MessageView>
+export function isValidMessageView<V>(v: V) {
+  return isValid<MessageView>(v, id, hashMessageView)
 }
 
 export interface DeletedMessageView {
+  $type?: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
   id: string
   rev: string
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isDeletedMessageView(
-  v: unknown,
-): v is DeletedMessageView & {
-  $type: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
-} {
-  return is$typed(v, id, 'deletedMessageView')
+const hashDeletedMessageView = 'deletedMessageView'
+
+export function isDeletedMessageView<V>(v: V) {
+  return is$typed(v, id, hashDeletedMessageView)
 }
 
-export function validateDeletedMessageView(v: unknown) {
-  return lexicons.validate(
-    `${id}#deletedMessageView`,
-    v,
-  ) as ValidationResult<DeletedMessageView>
+export function validateDeletedMessageView<V>(v: V) {
+  return validate<DeletedMessageView & V>(v, id, hashDeletedMessageView)
+}
+
+export function isValidDeletedMessageView<V>(v: V) {
+  return isValid<DeletedMessageView>(v, id, hashDeletedMessageView)
 }
 
 export interface MessageViewSender {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
   did: string
-  [k: string]: unknown
 }
 
-export function isMessageViewSender(
-  v: unknown,
-): v is MessageViewSender & {
-  $type: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
-} {
-  return is$typed(v, id, 'messageViewSender')
+const hashMessageViewSender = 'messageViewSender'
+
+export function isMessageViewSender<V>(v: V) {
+  return is$typed(v, id, hashMessageViewSender)
 }
 
-export function validateMessageViewSender(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageViewSender`,
-    v,
-  ) as ValidationResult<MessageViewSender>
+export function validateMessageViewSender<V>(v: V) {
+  return validate<MessageViewSender & V>(v, id, hashMessageViewSender)
+}
+
+export function isValidMessageViewSender<V>(v: V) {
+  return isValid<MessageViewSender>(v, id, hashMessageViewSender)
 }
 
 export interface ConvoView {
+  $type?: $Type<'chat.bsky.convo.defs', 'convoView'>
   id: string
   rev: string
   members: ChatBskyActorDefs.ProfileViewBasic[]
   lastMessage?:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MessageView>
+    | $Typed<DeletedMessageView>
+    | { $type: string }
   muted: boolean
   opened?: boolean
   unreadCount: number
-  [k: string]: unknown
 }
 
-export function isConvoView(
-  v: unknown,
-): v is ConvoView & { $type: $Type<'chat.bsky.convo.defs', 'convoView'> } {
-  return is$typed(v, id, 'convoView')
+const hashConvoView = 'convoView'
+
+export function isConvoView<V>(v: V) {
+  return is$typed(v, id, hashConvoView)
 }
 
-export function validateConvoView(v: unknown) {
-  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
+export function validateConvoView<V>(v: V) {
+  return validate<ConvoView & V>(v, id, hashConvoView)
+}
+
+export function isValidConvoView<V>(v: V) {
+  return isValid<ConvoView>(v, id, hashConvoView)
 }
 
 export interface LogBeginConvo {
+  $type?: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogBeginConvo(
-  v: unknown,
-): v is LogBeginConvo & {
-  $type: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
-} {
-  return is$typed(v, id, 'logBeginConvo')
+const hashLogBeginConvo = 'logBeginConvo'
+
+export function isLogBeginConvo<V>(v: V) {
+  return is$typed(v, id, hashLogBeginConvo)
 }
 
-export function validateLogBeginConvo(v: unknown) {
-  return lexicons.validate(
-    `${id}#logBeginConvo`,
-    v,
-  ) as ValidationResult<LogBeginConvo>
+export function validateLogBeginConvo<V>(v: V) {
+  return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
+}
+
+export function isValidLogBeginConvo<V>(v: V) {
+  return isValid<LogBeginConvo>(v, id, hashLogBeginConvo)
 }
 
 export interface LogLeaveConvo {
+  $type?: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogLeaveConvo(
-  v: unknown,
-): v is LogLeaveConvo & {
-  $type: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
-} {
-  return is$typed(v, id, 'logLeaveConvo')
+const hashLogLeaveConvo = 'logLeaveConvo'
+
+export function isLogLeaveConvo<V>(v: V) {
+  return is$typed(v, id, hashLogLeaveConvo)
 }
 
-export function validateLogLeaveConvo(v: unknown) {
-  return lexicons.validate(
-    `${id}#logLeaveConvo`,
-    v,
-  ) as ValidationResult<LogLeaveConvo>
+export function validateLogLeaveConvo<V>(v: V) {
+  return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
+}
+
+export function isValidLogLeaveConvo<V>(v: V) {
+  return isValid<LogLeaveConvo>(v, id, hashLogLeaveConvo)
 }
 
 export interface LogCreateMessage {
+  $type?: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogCreateMessage(
-  v: unknown,
-): v is LogCreateMessage & {
-  $type: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
-} {
-  return is$typed(v, id, 'logCreateMessage')
+const hashLogCreateMessage = 'logCreateMessage'
+
+export function isLogCreateMessage<V>(v: V) {
+  return is$typed(v, id, hashLogCreateMessage)
 }
 
-export function validateLogCreateMessage(v: unknown) {
-  return lexicons.validate(
-    `${id}#logCreateMessage`,
-    v,
-  ) as ValidationResult<LogCreateMessage>
+export function validateLogCreateMessage<V>(v: V) {
+  return validate<LogCreateMessage & V>(v, id, hashLogCreateMessage)
+}
+
+export function isValidLogCreateMessage<V>(v: V) {
+  return isValid<LogCreateMessage>(v, id, hashLogCreateMessage)
 }
 
 export interface LogDeleteMessage {
+  $type?: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
-}
-
-export function isLogDeleteMessage(
-  v: unknown,
-): v is LogDeleteMessage & {
-  $type: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
-} {
-  return is$typed(v, id, 'logDeleteMessage')
-}
-
-export function validateLogDeleteMessage(v: unknown) {
-  return lexicons.validate(
-    `${id}#logDeleteMessage`,
-    v,
-  ) as ValidationResult<LogDeleteMessage>
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
+}
+
+const hashLogDeleteMessage = 'logDeleteMessage'
+
+export function isLogDeleteMessage<V>(v: V) {
+  return is$typed(v, id, hashLogDeleteMessage)
+}
+
+export function validateLogDeleteMessage<V>(v: V) {
+  return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
+}
+
+export function isValidLogDeleteMessage<V>(v: V) {
+  return isValid<LogDeleteMessage>(v, id, hashLogDeleteMessage)
 }
diff --git a/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
index 0679a4fe677..c5bcf1c1e96 100644
--- a/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.deleteMessageForSelf'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.DeletedMessageView
diff --git a/packages/api/src/client/types/chat/bsky/convo/getConvo.ts b/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
index ba605729939..99c309bdb93 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getConvo'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts b/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
index 795845b7379..ecc1f026651 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getConvoForMembers'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/getLog.ts b/packages/api/src/client/types/chat/bsky/convo/getLog.ts
index 4185bc39c12..ce8801ddf1d 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getLog.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getLog.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getLog'
 
 export interface QueryParams {
@@ -19,13 +25,12 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   logs: (
-    | ChatBskyConvoDefs.LogBeginConvo
-    | ChatBskyConvoDefs.LogLeaveConvo
-    | ChatBskyConvoDefs.LogCreateMessage
-    | ChatBskyConvoDefs.LogDeleteMessage
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
+    | $Typed<ChatBskyConvoDefs.LogCreateMessage>
+    | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/getMessages.ts b/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
index d9f043c8081..dfa319e6338 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getMessages'
 
 export interface QueryParams {
@@ -21,11 +27,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts b/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
index 5feed2d0ffb..c43b59daa29 100644
--- a/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
@@ -4,22 +4,26 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.leaveConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convoId: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/listConvos.ts b/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
index 19fcfc73554..fd9f8250386 100644
--- a/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.listConvos'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   convos: ChatBskyConvoDefs.ConvoView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts b/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
index caf7dc9c4a7..514f1c56145 100644
--- a/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
@@ -4,22 +4,26 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.muteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts b/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
index b5749f68c49..7422ea58fef 100644
--- a/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.sendMessage'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.MessageView
diff --git a/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts b/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
index 64e86464576..6f8759347ee 100644
--- a/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
@@ -4,22 +4,26 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.sendMessageBatch'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   items: BatchItem[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   items: ChatBskyConvoDefs.MessageView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -40,19 +44,21 @@ export function toKnownErr(e: any) {
 }
 
 export interface BatchItem {
+  $type?: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
-export function isBatchItem(
-  v: unknown,
-): v is BatchItem & {
-  $type: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
-} {
-  return is$typed(v, id, 'batchItem')
+const hashBatchItem = 'batchItem'
+
+export function isBatchItem<V>(v: V) {
+  return is$typed(v, id, hashBatchItem)
+}
+
+export function validateBatchItem<V>(v: V) {
+  return validate<BatchItem & V>(v, id, hashBatchItem)
 }
 
-export function validateBatchItem(v: unknown) {
-  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
+export function isValidBatchItem<V>(v: V) {
+  return isValid<BatchItem>(v, id, hashBatchItem)
 }
diff --git a/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts b/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
index 7bbf475d509..d959a497457 100644
--- a/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
@@ -4,22 +4,26 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.unmuteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/updateRead.ts b/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
index a990b1d14bf..1cb1f99841f 100644
--- a/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.updateRead'
 
 export interface QueryParams {}
@@ -15,12 +21,10 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   messageId?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts b/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
index 3071f5cea03..f94ae2d7e1d 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.getActorMetadata'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export interface OutputSchema {
   day: Metadata
   month: Metadata
   all: Metadata
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -38,21 +43,23 @@ export function toKnownErr(e: any) {
 }
 
 export interface Metadata {
+  $type?: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
   messagesSent: number
   messagesReceived: number
   convos: number
   convosStarted: number
-  [k: string]: unknown
 }
 
-export function isMetadata(
-  v: unknown,
-): v is Metadata & {
-  $type: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
-} {
-  return is$typed(v, id, 'metadata')
+const hashMetadata = 'metadata'
+
+export function isMetadata<V>(v: V) {
+  return is$typed(v, id, hashMetadata)
+}
+
+export function validateMetadata<V>(v: V) {
+  return validate<Metadata & V>(v, id, hashMetadata)
 }
 
-export function validateMetadata(v: unknown) {
-  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
+export function isValidMetadata<V>(v: V) {
+  return isValid<Metadata>(v, id, hashMetadata)
 }
diff --git a/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts b/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
index 5ac31fa6ea9..a919014ea1c 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ChatBskyConvoDefs from '../convo/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from '../convo/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.getMessageContext'
 
 export interface QueryParams {
@@ -22,11 +28,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts b/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
index daf01350424..19b121fe761 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.updateActorAccess'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface InputSchema {
   actor: string
   allowAccess: boolean
   ref?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/defs.ts b/packages/api/src/client/types/com/atproto/admin/defs.ts
index 329f267aad1..83f247d978c 100644
--- a/packages/api/src/client/types/com/atproto/admin/defs.ts
+++ b/packages/api/src/client/types/com/atproto/admin/defs.ts
@@ -3,36 +3,44 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoServerDefs from '../server/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from '../server/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.defs'
 
 export interface StatusAttr {
+  $type?: $Type<'com.atproto.admin.defs', 'statusAttr'>
   applied: boolean
   ref?: string
-  [k: string]: unknown
 }
 
-export function isStatusAttr(
-  v: unknown,
-): v is StatusAttr & { $type: $Type<'com.atproto.admin.defs', 'statusAttr'> } {
-  return is$typed(v, id, 'statusAttr')
+const hashStatusAttr = 'statusAttr'
+
+export function isStatusAttr<V>(v: V) {
+  return is$typed(v, id, hashStatusAttr)
+}
+
+export function validateStatusAttr<V>(v: V) {
+  return validate<StatusAttr & V>(v, id, hashStatusAttr)
 }
 
-export function validateStatusAttr(v: unknown) {
-  return lexicons.validate(
-    `${id}#statusAttr`,
-    v,
-  ) as ValidationResult<StatusAttr>
+export function isValidStatusAttr<V>(v: V) {
+  return isValid<StatusAttr>(v, id, hashStatusAttr)
 }
 
 export interface AccountView {
+  $type?: $Type<'com.atproto.admin.defs', 'accountView'>
   did: string
   handle: string
   email?: string
-  relatedRecords?: {}[]
+  relatedRecords?: { [_ in string]: unknown }[]
   indexedAt: string
   invitedBy?: ComAtprotoServerDefs.InviteCode
   invites?: ComAtprotoServerDefs.InviteCode[]
@@ -41,78 +49,78 @@ export interface AccountView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isAccountView(
-  v: unknown,
-): v is AccountView & {
-  $type: $Type<'com.atproto.admin.defs', 'accountView'>
-} {
-  return is$typed(v, id, 'accountView')
+const hashAccountView = 'accountView'
+
+export function isAccountView<V>(v: V) {
+  return is$typed(v, id, hashAccountView)
+}
+
+export function validateAccountView<V>(v: V) {
+  return validate<AccountView & V>(v, id, hashAccountView)
 }
 
-export function validateAccountView(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountView`,
-    v,
-  ) as ValidationResult<AccountView>
+export function isValidAccountView<V>(v: V) {
+  return isValid<AccountView>(v, id, hashAccountView)
 }
 
 export interface RepoRef {
+  $type?: $Type<'com.atproto.admin.defs', 'repoRef'>
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoRef(
-  v: unknown,
-): v is RepoRef & { $type: $Type<'com.atproto.admin.defs', 'repoRef'> } {
-  return is$typed(v, id, 'repoRef')
+const hashRepoRef = 'repoRef'
+
+export function isRepoRef<V>(v: V) {
+  return is$typed(v, id, hashRepoRef)
+}
+
+export function validateRepoRef<V>(v: V) {
+  return validate<RepoRef & V>(v, id, hashRepoRef)
 }
 
-export function validateRepoRef(v: unknown) {
-  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
+export function isValidRepoRef<V>(v: V) {
+  return isValid<RepoRef>(v, id, hashRepoRef)
 }
 
 export interface RepoBlobRef {
+  $type?: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
   did: string
   cid: string
   recordUri?: string
-  [k: string]: unknown
 }
 
-export function isRepoBlobRef(
-  v: unknown,
-): v is RepoBlobRef & {
-  $type: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
-} {
-  return is$typed(v, id, 'repoBlobRef')
+const hashRepoBlobRef = 'repoBlobRef'
+
+export function isRepoBlobRef<V>(v: V) {
+  return is$typed(v, id, hashRepoBlobRef)
+}
+
+export function validateRepoBlobRef<V>(v: V) {
+  return validate<RepoBlobRef & V>(v, id, hashRepoBlobRef)
 }
 
-export function validateRepoBlobRef(v: unknown) {
-  return lexicons.validate(
-    `${id}#repoBlobRef`,
-    v,
-  ) as ValidationResult<RepoBlobRef>
+export function isValidRepoBlobRef<V>(v: V) {
+  return isValid<RepoBlobRef>(v, id, hashRepoBlobRef)
 }
 
 export interface ThreatSignature {
+  $type?: $Type<'com.atproto.admin.defs', 'threatSignature'>
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isThreatSignature(
-  v: unknown,
-): v is ThreatSignature & {
-  $type: $Type<'com.atproto.admin.defs', 'threatSignature'>
-} {
-  return is$typed(v, id, 'threatSignature')
+const hashThreatSignature = 'threatSignature'
+
+export function isThreatSignature<V>(v: V) {
+  return is$typed(v, id, hashThreatSignature)
+}
+
+export function validateThreatSignature<V>(v: V) {
+  return validate<ThreatSignature & V>(v, id, hashThreatSignature)
 }
 
-export function validateThreatSignature(v: unknown) {
-  return lexicons.validate(
-    `${id}#threatSignature`,
-    v,
-  ) as ValidationResult<ThreatSignature>
+export function isValidThreatSignature<V>(v: V) {
+  return isValid<ThreatSignature>(v, id, hashThreatSignature)
 }
diff --git a/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts b/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
index ad77e52f254..807b7cd9f3f 100644
--- a/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.deleteAccount'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts b/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
index 0be94798622..b5737b5fcc0 100644
--- a/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.disableAccountInvites'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for disabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts b/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
index 20149d69098..110c252da7b 100644
--- a/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.disableInviteCodes'
 
 export interface QueryParams {}
@@ -14,7 +20,6 @@ export interface QueryParams {}
 export interface InputSchema {
   codes?: string[]
   accounts?: string[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts b/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
index f98d75f0638..10bb24f7e63 100644
--- a/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.enableAccountInvites'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for enabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts b/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
index b99538478f3..d486b45e6be 100644
--- a/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoAdminDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getAccountInfo'
 
 export interface QueryParams {
diff --git a/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts b/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
index f92ab95b675..38d4792c59e 100644
--- a/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoAdminDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getAccountInfos'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   infos: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts b/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
index dba73561108..cb6bded3d9d 100644
--- a/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoServerDefs from '../server/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from '../server/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getInviteCodes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts b/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
index 771b3aeb8fa..58263489656 100644
--- a/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
@@ -4,11 +4,17 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getSubjectStatus'
 
 export interface QueryParams {
@@ -21,13 +27,12 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts b/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
index 861e1db3b48..0e9c1612eea 100644
--- a/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoAdminDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.searchAccounts'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/sendEmail.ts b/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
index 55ac6dbf24b..f591655a596 100644
--- a/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
+++ b/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.sendEmail'
 
 export interface QueryParams {}
@@ -18,12 +24,10 @@ export interface InputSchema {
   senderDid: string
   /** Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers */
   comment?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   sent: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts b/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
index 99a48490a6d..e8ca06d32fb 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountEmail'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface InputSchema {
   /** The handle or DID of the repo. */
   account: string
   email: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts b/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
index 974144910ee..1c154cc2852 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountHandle'
 
 export interface QueryParams {}
@@ -14,7 +20,6 @@ export interface QueryParams {}
 export interface InputSchema {
   did: string
   handle: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts b/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
index 5c06c7f0df0..1f2068d5024 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountPassword'
 
 export interface QueryParams {}
@@ -14,7 +20,6 @@ export interface QueryParams {}
 export interface InputSchema {
   did: string
   password: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts b/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
index 977ff64ab4e..45c6ad7a4d3 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
@@ -4,34 +4,38 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateSubjectStatus'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 040338ae5e9..e556ed41061 100644
--- a/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.getRecommendedDidCredentials'
 
 export interface QueryParams {}
@@ -17,9 +23,8 @@ export interface OutputSchema {
   /** Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. */
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
index e3dccdc0b20..d454c5c4583 100644
--- a/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.requestPlcOperationSignature'
 
 export interface QueryParams {}
diff --git a/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts b/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
index afc0829e338..3c8518e6251 100644
--- a/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.resolveHandle'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts b/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
index 3847e611a56..b343fe63c16 100644
--- a/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.signPlcOperation'
 
 export interface QueryParams {}
@@ -16,15 +22,13 @@ export interface InputSchema {
   token?: string
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface OutputSchema {
   /** A signed DID PLC operation. */
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts b/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
index e1042ad1774..af223b1e4ef 100644
--- a/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.submitPlcOperation'
 
 export interface QueryParams {}
 
 export interface InputSchema {
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/identity/updateHandle.ts b/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
index 9ff1845c051..92e98805b1f 100644
--- a/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
+++ b/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.updateHandle'
 
 export interface QueryParams {}
@@ -14,7 +20,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** The new handle. */
   handle: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/label/defs.ts b/packages/api/src/client/types/com/atproto/label/defs.ts
index dfc59333ea6..07a0a5293cd 100644
--- a/packages/api/src/client/types/com/atproto/label/defs.ts
+++ b/packages/api/src/client/types/com/atproto/label/defs.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
+  $type?: $Type<'com.atproto.label.defs', 'label'>
   /** The AT Protocol version of the label object. */
   ver?: number
   /** DID of the actor who created this label. */
@@ -28,57 +35,66 @@ export interface Label {
   exp?: string
   /** Signature of dag-cbor encoded label. */
   sig?: Uint8Array
-  [k: string]: unknown
 }
 
-export function isLabel(
-  v: unknown,
-): v is Label & { $type: $Type<'com.atproto.label.defs', 'label'> } {
-  return is$typed(v, id, 'label')
+const hashLabel = 'label'
+
+export function isLabel<V>(v: V) {
+  return is$typed(v, id, hashLabel)
 }
 
-export function validateLabel(v: unknown) {
-  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
+export function validateLabel<V>(v: V) {
+  return validate<Label & V>(v, id, hashLabel)
+}
+
+export function isValidLabel<V>(v: V) {
+  return isValid<Label>(v, id, hashLabel)
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
 export interface SelfLabels {
+  $type?: $Type<'com.atproto.label.defs', 'selfLabels'>
   values: SelfLabel[]
-  [k: string]: unknown
 }
 
-export function isSelfLabels(
-  v: unknown,
-): v is SelfLabels & { $type: $Type<'com.atproto.label.defs', 'selfLabels'> } {
-  return is$typed(v, id, 'selfLabels')
+const hashSelfLabels = 'selfLabels'
+
+export function isSelfLabels<V>(v: V) {
+  return is$typed(v, id, hashSelfLabels)
+}
+
+export function validateSelfLabels<V>(v: V) {
+  return validate<SelfLabels & V>(v, id, hashSelfLabels)
 }
 
-export function validateSelfLabels(v: unknown) {
-  return lexicons.validate(
-    `${id}#selfLabels`,
-    v,
-  ) as ValidationResult<SelfLabels>
+export function isValidSelfLabels<V>(v: V) {
+  return isValid<SelfLabels>(v, id, hashSelfLabels)
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
 export interface SelfLabel {
+  $type?: $Type<'com.atproto.label.defs', 'selfLabel'>
   /** The short string name of the value or type of this label. */
   val: string
-  [k: string]: unknown
 }
 
-export function isSelfLabel(
-  v: unknown,
-): v is SelfLabel & { $type: $Type<'com.atproto.label.defs', 'selfLabel'> } {
-  return is$typed(v, id, 'selfLabel')
+const hashSelfLabel = 'selfLabel'
+
+export function isSelfLabel<V>(v: V) {
+  return is$typed(v, id, hashSelfLabel)
 }
 
-export function validateSelfLabel(v: unknown) {
-  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
+export function validateSelfLabel<V>(v: V) {
+  return validate<SelfLabel & V>(v, id, hashSelfLabel)
+}
+
+export function isValidSelfLabel<V>(v: V) {
+  return isValid<SelfLabel>(v, id, hashSelfLabel)
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
 export interface LabelValueDefinition {
+  $type?: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
   /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
   identifier: string
   /** How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. */
@@ -90,48 +106,53 @@ export interface LabelValueDefinition {
   /** Does the user need to have adult content enabled in order to configure this label? */
   adultOnly?: boolean
   locales: LabelValueDefinitionStrings[]
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinition(
-  v: unknown,
-): v is LabelValueDefinition & {
-  $type: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
-} {
-  return is$typed(v, id, 'labelValueDefinition')
+const hashLabelValueDefinition = 'labelValueDefinition'
+
+export function isLabelValueDefinition<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinition)
 }
 
-export function validateLabelValueDefinition(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelValueDefinition`,
-    v,
-  ) as ValidationResult<LabelValueDefinition>
+export function validateLabelValueDefinition<V>(v: V) {
+  return validate<LabelValueDefinition & V>(v, id, hashLabelValueDefinition)
+}
+
+export function isValidLabelValueDefinition<V>(v: V) {
+  return isValid<LabelValueDefinition>(v, id, hashLabelValueDefinition)
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
 export interface LabelValueDefinitionStrings {
+  $type?: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
   /** The code of the language these strings are written in. */
   lang: string
   /** A short human-readable name for the label. */
   name: string
   /** A longer description of what the label means and why it might be applied. */
   description: string
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinitionStrings(
-  v: unknown,
-): v is LabelValueDefinitionStrings & {
-  $type: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
-} {
-  return is$typed(v, id, 'labelValueDefinitionStrings')
+const hashLabelValueDefinitionStrings = 'labelValueDefinitionStrings'
+
+export function isLabelValueDefinitionStrings<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinitionStrings)
+}
+
+export function validateLabelValueDefinitionStrings<V>(v: V) {
+  return validate<LabelValueDefinitionStrings & V>(
+    v,
+    id,
+    hashLabelValueDefinitionStrings,
+  )
 }
 
-export function validateLabelValueDefinitionStrings(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelValueDefinitionStrings`,
+export function isValidLabelValueDefinitionStrings<V>(v: V) {
+  return isValid<LabelValueDefinitionStrings>(
     v,
-  ) as ValidationResult<LabelValueDefinitionStrings>
+    id,
+    hashLabelValueDefinitionStrings,
+  )
 }
 
 export type LabelValue =
diff --git a/packages/api/src/client/types/com/atproto/label/queryLabels.ts b/packages/api/src/client/types/com/atproto/label/queryLabels.ts
index e5ed6be6630..e258794494d 100644
--- a/packages/api/src/client/types/com/atproto/label/queryLabels.ts
+++ b/packages/api/src/client/types/com/atproto/label/queryLabels.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoLabelDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.queryLabels'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts b/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
index a7d53d6016b..fe487a6d0e3 100644
--- a/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
@@ -4,42 +4,54 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoLabelDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.subscribeLabels'
 
 export interface Labels {
+  $type?: $Type<'com.atproto.label.subscribeLabels', 'labels'>
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabels(
-  v: unknown,
-): v is Labels & {
-  $type: $Type<'com.atproto.label.subscribeLabels', 'labels'>
-} {
-  return is$typed(v, id, 'labels')
+const hashLabels = 'labels'
+
+export function isLabels<V>(v: V) {
+  return is$typed(v, id, hashLabels)
+}
+
+export function validateLabels<V>(v: V) {
+  return validate<Labels & V>(v, id, hashLabels)
 }
 
-export function validateLabels(v: unknown) {
-  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
+export function isValidLabels<V>(v: V) {
+  return isValid<Labels>(v, id, hashLabels)
 }
 
 export interface Info {
+  $type?: $Type<'com.atproto.label.subscribeLabels', 'info'>
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(
-  v: unknown,
-): v is Info & { $type: $Type<'com.atproto.label.subscribeLabels', 'info'> } {
-  return is$typed(v, id, 'info')
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
+}
+
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown) {
-  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
+export function isValidInfo<V>(v: V) {
+  return isValid<Info>(v, id, hashInfo)
 }
diff --git a/packages/api/src/client/types/com/atproto/moderation/createReport.ts b/packages/api/src/client/types/com/atproto/moderation/createReport.ts
index 85a7598ca4b..a4dc5d1a0fa 100644
--- a/packages/api/src/client/types/com/atproto/moderation/createReport.ts
+++ b/packages/api/src/client/types/com/atproto/moderation/createReport.ts
@@ -4,12 +4,18 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../admin/defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoModerationDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../admin/defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.moderation.createReport'
 
 export interface QueryParams {}
@@ -19,10 +25,9 @@ export interface InputSchema {
   /** Additional context about the content and violation. */
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
 }
 
 export interface OutputSchema {
@@ -30,12 +35,11 @@ export interface OutputSchema {
   reasonType: ComAtprotoModerationDefs.ReasonType
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   reportedBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/moderation/defs.ts b/packages/api/src/client/types/com/atproto/moderation/defs.ts
index 9e7a01d4a3b..4e2c8e68cbb 100644
--- a/packages/api/src/client/types/com/atproto/moderation/defs.ts
+++ b/packages/api/src/client/types/com/atproto/moderation/defs.ts
@@ -3,9 +3,15 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
diff --git a/packages/api/src/client/types/com/atproto/repo/applyWrites.ts b/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
index 5174386796b..baacb9d065c 100644
--- a/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
+++ b/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoRepoDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.applyWrites'
 
 export interface QueryParams {}
@@ -17,16 +23,18 @@ export interface InputSchema {
   repo: string
   /** Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
-  writes: (Create | Update | Delete)[]
+  writes: ($Typed<Create> | $Typed<Update> | $Typed<Delete>)[]
   /** If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  results?: (CreateResult | UpdateResult | DeleteResult)[]
-  [k: string]: unknown
+  results?: (
+    | $Typed<CreateResult>
+    | $Typed<UpdateResult>
+    | $Typed<DeleteResult>
+  )[]
 }
 
 export interface CallOptions {
@@ -58,116 +66,125 @@ export function toKnownErr(e: any) {
 
 /** Operation which creates a new record. */
 export interface Create {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'create'>
   collection: string
   rkey?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isCreate(
-  v: unknown,
-): v is Create & { $type: $Type<'com.atproto.repo.applyWrites', 'create'> } {
-  return is$typed(v, id, 'create')
+const hashCreate = 'create'
+
+export function isCreate<V>(v: V) {
+  return is$typed(v, id, hashCreate)
 }
 
-export function validateCreate(v: unknown) {
-  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
+export function validateCreate<V>(v: V) {
+  return validate<Create & V>(v, id, hashCreate)
+}
+
+export function isValidCreate<V>(v: V) {
+  return isValid<Create>(v, id, hashCreate)
 }
 
 /** Operation which updates an existing record. */
 export interface Update {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'update'>
   collection: string
   rkey: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
+}
+
+const hashUpdate = 'update'
+
+export function isUpdate<V>(v: V) {
+  return is$typed(v, id, hashUpdate)
 }
 
-export function isUpdate(
-  v: unknown,
-): v is Update & { $type: $Type<'com.atproto.repo.applyWrites', 'update'> } {
-  return is$typed(v, id, 'update')
+export function validateUpdate<V>(v: V) {
+  return validate<Update & V>(v, id, hashUpdate)
 }
 
-export function validateUpdate(v: unknown) {
-  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
+export function isValidUpdate<V>(v: V) {
+  return isValid<Update>(v, id, hashUpdate)
 }
 
 /** Operation which deletes an existing record. */
 export interface Delete {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'delete'>
   collection: string
   rkey: string
-  [k: string]: unknown
 }
 
-export function isDelete(
-  v: unknown,
-): v is Delete & { $type: $Type<'com.atproto.repo.applyWrites', 'delete'> } {
-  return is$typed(v, id, 'delete')
+const hashDelete = 'delete'
+
+export function isDelete<V>(v: V) {
+  return is$typed(v, id, hashDelete)
+}
+
+export function validateDelete<V>(v: V) {
+  return validate<Delete & V>(v, id, hashDelete)
 }
 
-export function validateDelete(v: unknown) {
-  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
+export function isValidDelete<V>(v: V) {
+  return isValid<Delete>(v, id, hashDelete)
 }
 
 export interface CreateResult {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'createResult'>
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isCreateResult(
-  v: unknown,
-): v is CreateResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'createResult'>
-} {
-  return is$typed(v, id, 'createResult')
+const hashCreateResult = 'createResult'
+
+export function isCreateResult<V>(v: V) {
+  return is$typed(v, id, hashCreateResult)
+}
+
+export function validateCreateResult<V>(v: V) {
+  return validate<CreateResult & V>(v, id, hashCreateResult)
 }
 
-export function validateCreateResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#createResult`,
-    v,
-  ) as ValidationResult<CreateResult>
+export function isValidCreateResult<V>(v: V) {
+  return isValid<CreateResult>(v, id, hashCreateResult)
 }
 
 export interface UpdateResult {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isUpdateResult(
-  v: unknown,
-): v is UpdateResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
-} {
-  return is$typed(v, id, 'updateResult')
+const hashUpdateResult = 'updateResult'
+
+export function isUpdateResult<V>(v: V) {
+  return is$typed(v, id, hashUpdateResult)
 }
 
-export function validateUpdateResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#updateResult`,
-    v,
-  ) as ValidationResult<UpdateResult>
+export function validateUpdateResult<V>(v: V) {
+  return validate<UpdateResult & V>(v, id, hashUpdateResult)
+}
+
+export function isValidUpdateResult<V>(v: V) {
+  return isValid<UpdateResult>(v, id, hashUpdateResult)
 }
 
 export interface DeleteResult {
-  [k: string]: unknown
+  $type?: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
+}
+
+const hashDeleteResult = 'deleteResult'
+
+export function isDeleteResult<V>(v: V) {
+  return is$typed(v, id, hashDeleteResult)
 }
 
-export function isDeleteResult(
-  v: unknown,
-): v is DeleteResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
-} {
-  return is$typed(v, id, 'deleteResult')
+export function validateDeleteResult<V>(v: V) {
+  return validate<DeleteResult & V>(v, id, hashDeleteResult)
 }
 
-export function validateDeleteResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#deleteResult`,
-    v,
-  ) as ValidationResult<DeleteResult>
+export function isValidDeleteResult<V>(v: V) {
+  return isValid<DeleteResult>(v, id, hashDeleteResult)
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/createRecord.ts b/packages/api/src/client/types/com/atproto/repo/createRecord.ts
index 4a4b2dfb1a1..0d077a252d4 100644
--- a/packages/api/src/client/types/com/atproto/repo/createRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/createRecord.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoRepoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.createRecord'
 
 export interface QueryParams {}
@@ -22,10 +28,9 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record itself. Must contain a $type field. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -33,7 +38,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/repo/defs.ts b/packages/api/src/client/types/com/atproto/repo/defs.ts
index ca790068a37..960bb17d66d 100644
--- a/packages/api/src/client/types/com/atproto/repo/defs.ts
+++ b/packages/api/src/client/types/com/atproto/repo/defs.ts
@@ -3,26 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
+  $type?: $Type<'com.atproto.repo.defs', 'commitMeta'>
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
-export function isCommitMeta(
-  v: unknown,
-): v is CommitMeta & { $type: $Type<'com.atproto.repo.defs', 'commitMeta'> } {
-  return is$typed(v, id, 'commitMeta')
+const hashCommitMeta = 'commitMeta'
+
+export function isCommitMeta<V>(v: V) {
+  return is$typed(v, id, hashCommitMeta)
+}
+
+export function validateCommitMeta<V>(v: V) {
+  return validate<CommitMeta & V>(v, id, hashCommitMeta)
 }
 
-export function validateCommitMeta(v: unknown) {
-  return lexicons.validate(
-    `${id}#commitMeta`,
-    v,
-  ) as ValidationResult<CommitMeta>
+export function isValidCommitMeta<V>(v: V) {
+  return isValid<CommitMeta>(v, id, hashCommitMeta)
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts b/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
index 2d2a70cbca8..d7d3286a13c 100644
--- a/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoRepoDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.deleteRecord'
 
 export interface QueryParams {}
@@ -23,12 +29,10 @@ export interface InputSchema {
   swapRecord?: string
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/repo/describeRepo.ts b/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
index cbd36a79dca..735ed691188 100644
--- a/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
+++ b/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.describeRepo'
 
 export interface QueryParams {
@@ -20,12 +26,11 @@ export interface OutputSchema {
   handle: string
   did: string
   /** The complete DID document for this account. */
-  didDoc: {}
+  didDoc: { [_ in string]: unknown }
   /** List of all the collections (NSIDs) for which this repo contains at least one record. */
   collections: string[]
   /** Indicates if handle is currently valid (resolves bi-directionally) */
   handleIsCorrect: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/repo/getRecord.ts b/packages/api/src/client/types/com/atproto/repo/getRecord.ts
index 14c83189b50..658fe061b21 100644
--- a/packages/api/src/client/types/com/atproto/repo/getRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/getRecord.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.getRecord'
 
 export interface QueryParams {
@@ -25,8 +31,7 @@ export type InputSchema = undefined
 export interface OutputSchema {
   uri: string
   cid?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/repo/importRepo.ts b/packages/api/src/client/types/com/atproto/repo/importRepo.ts
index 6a5fc955574..d8d53c0ddd5 100644
--- a/packages/api/src/client/types/com/atproto/repo/importRepo.ts
+++ b/packages/api/src/client/types/com/atproto/repo/importRepo.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.importRepo'
 
 export interface QueryParams {}
diff --git a/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts b/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
index a01772db6e6..5a278ff912f 100644
--- a/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.listMissingBlobs'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blobs: RecordBlob[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -38,22 +43,21 @@ export function toKnownErr(e: any) {
 }
 
 export interface RecordBlob {
+  $type?: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
   cid: string
   recordUri: string
-  [k: string]: unknown
 }
 
-export function isRecordBlob(
-  v: unknown,
-): v is RecordBlob & {
-  $type: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
-} {
-  return is$typed(v, id, 'recordBlob')
+const hashRecordBlob = 'recordBlob'
+
+export function isRecordBlob<V>(v: V) {
+  return is$typed(v, id, hashRecordBlob)
+}
+
+export function validateRecordBlob<V>(v: V) {
+  return validate<RecordBlob & V>(v, id, hashRecordBlob)
 }
 
-export function validateRecordBlob(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordBlob`,
-    v,
-  ) as ValidationResult<RecordBlob>
+export function isValidRecordBlob<V>(v: V) {
+  return isValid<RecordBlob>(v, id, hashRecordBlob)
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/listRecords.ts b/packages/api/src/client/types/com/atproto/repo/listRecords.ts
index 0c77a31841c..b9481c99db0 100644
--- a/packages/api/src/client/types/com/atproto/repo/listRecords.ts
+++ b/packages/api/src/client/types/com/atproto/repo/listRecords.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.listRecords'
 
 export interface QueryParams {
@@ -30,7 +36,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   records: Record[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -49,18 +54,22 @@ export function toKnownErr(e: any) {
 }
 
 export interface Record {
+  $type?: $Type<'com.atproto.repo.listRecords', 'record'>
   uri: string
   cid: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'com.atproto.repo.listRecords', 'record'> } {
-  return is$typed(v, id, 'record')
+const hashRecord = 'record'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord)
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/putRecord.ts b/packages/api/src/client/types/com/atproto/repo/putRecord.ts
index 2879a071a69..0b91c5f52c0 100644
--- a/packages/api/src/client/types/com/atproto/repo/putRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/putRecord.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoRepoDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.putRecord'
 
 export interface QueryParams {}
@@ -22,12 +28,11 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record to write. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation */
   swapRecord?: string | null
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -35,7 +40,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/repo/strongRef.ts b/packages/api/src/client/types/com/atproto/repo/strongRef.ts
index 78624a17cac..b4bb1c08e62 100644
--- a/packages/api/src/client/types/com/atproto/repo/strongRef.ts
+++ b/packages/api/src/client/types/com/atproto/repo/strongRef.ts
@@ -3,23 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
+  $type?: $Type<'com.atproto.repo.strongRef', 'main'>
   uri: string
   cid: string
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'com.atproto.repo.strongRef', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts b/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
index 924a3fb4b22..00edde90958 100644
--- a/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.uploadBlob'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/activateAccount.ts b/packages/api/src/client/types/com/atproto/server/activateAccount.ts
index d0859098b9e..4ed83a54f77 100644
--- a/packages/api/src/client/types/com/atproto/server/activateAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/activateAccount.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.activateAccount'
 
 export interface QueryParams {}
diff --git a/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts b/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
index 03213d9d250..242c596349c 100644
--- a/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.checkAccountStatus'
 
 export interface QueryParams {}
@@ -23,7 +29,6 @@ export interface OutputSchema {
   privateStateValues: number
   expectedBlobs: number
   importedBlobs: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/confirmEmail.ts b/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
index 8a61ed74d98..8062d06c67d 100644
--- a/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
+++ b/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.confirmEmail'
 
 export interface QueryParams {}
@@ -14,7 +20,6 @@ export interface QueryParams {}
 export interface InputSchema {
   email: string
   token: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/createAccount.ts b/packages/api/src/client/types/com/atproto/server/createAccount.ts
index 5058c261e91..867970c540c 100644
--- a/packages/api/src/client/types/com/atproto/server/createAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/createAccount.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createAccount'
 
 export interface QueryParams {}
@@ -25,8 +31,7 @@ export interface InputSchema {
   /** DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. */
   recoveryKey?: string
   /** A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. */
-  plcOp?: {}
-  [k: string]: unknown
+  plcOp?: { [_ in string]: unknown }
 }
 
 /** Account login session returned on successful account creation. */
@@ -37,8 +42,7 @@ export interface OutputSchema {
   /** The DID of the new account. */
   did: string
   /** Complete DID document. */
-  didDoc?: {}
-  [k: string]: unknown
+  didDoc?: { [_ in string]: unknown }
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/createAppPassword.ts b/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
index db797caac04..b651e3db226 100644
--- a/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createAppPassword'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   name: string
   /** If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. */
   privileged?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = AppPassword
@@ -49,24 +54,23 @@ export function toKnownErr(e: any) {
 }
 
 export interface AppPassword {
+  $type?: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
   name: string
   password: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(
-  v: unknown,
-): v is AppPassword & {
-  $type: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
-} {
-  return is$typed(v, id, 'appPassword')
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
+}
+
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown) {
-  return lexicons.validate(
-    `${id}#appPassword`,
-    v,
-  ) as ValidationResult<AppPassword>
+export function isValidAppPassword<V>(v: V) {
+  return isValid<AppPassword>(v, id, hashAppPassword)
 }
diff --git a/packages/api/src/client/types/com/atproto/server/createInviteCode.ts b/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
index c9714e1554a..212662d63da 100644
--- a/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
+++ b/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createInviteCode'
 
 export interface QueryParams {}
@@ -14,12 +20,10 @@ export interface QueryParams {}
 export interface InputSchema {
   useCount: number
   forAccount?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   code: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts b/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
index 90f548ccbad..096e83d4309 100644
--- a/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createInviteCodes'
 
 export interface QueryParams {}
@@ -15,12 +21,10 @@ export interface InputSchema {
   codeCount: number
   useCount: number
   forAccounts?: string[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   codes: AccountCodes[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -41,22 +45,21 @@ export function toKnownErr(e: any) {
 }
 
 export interface AccountCodes {
+  $type?: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
   account: string
   codes: string[]
-  [k: string]: unknown
 }
 
-export function isAccountCodes(
-  v: unknown,
-): v is AccountCodes & {
-  $type: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
-} {
-  return is$typed(v, id, 'accountCodes')
+const hashAccountCodes = 'accountCodes'
+
+export function isAccountCodes<V>(v: V) {
+  return is$typed(v, id, hashAccountCodes)
+}
+
+export function validateAccountCodes<V>(v: V) {
+  return validate<AccountCodes & V>(v, id, hashAccountCodes)
 }
 
-export function validateAccountCodes(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountCodes`,
-    v,
-  ) as ValidationResult<AccountCodes>
+export function isValidAccountCodes<V>(v: V) {
+  return isValid<AccountCodes>(v, id, hashAccountCodes)
 }
diff --git a/packages/api/src/client/types/com/atproto/server/createSession.ts b/packages/api/src/client/types/com/atproto/server/createSession.ts
index eddf6fc380a..1fb0292bcb6 100644
--- a/packages/api/src/client/types/com/atproto/server/createSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/createSession.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createSession'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   identifier: string
   password: string
   authFactorToken?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -24,14 +29,13 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts b/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
index c026604b1d6..ecb9ade6c99 100644
--- a/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deactivateAccount'
 
 export interface QueryParams {}
@@ -14,7 +20,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** A recommendation to server as to how long they should hold onto the deactivated account before deleting. */
   deleteAfter?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/defs.ts b/packages/api/src/client/types/com/atproto/server/defs.ts
index 08e4cc7240e..d8aa65cfcd2 100644
--- a/packages/api/src/client/types/com/atproto/server/defs.ts
+++ b/packages/api/src/client/types/com/atproto/server/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
+  $type?: $Type<'com.atproto.server.defs', 'inviteCode'>
   code: string
   available: number
   disabled: boolean
@@ -16,39 +23,38 @@ export interface InviteCode {
   createdBy: string
   createdAt: string
   uses: InviteCodeUse[]
-  [k: string]: unknown
 }
 
-export function isInviteCode(
-  v: unknown,
-): v is InviteCode & { $type: $Type<'com.atproto.server.defs', 'inviteCode'> } {
-  return is$typed(v, id, 'inviteCode')
+const hashInviteCode = 'inviteCode'
+
+export function isInviteCode<V>(v: V) {
+  return is$typed(v, id, hashInviteCode)
+}
+
+export function validateInviteCode<V>(v: V) {
+  return validate<InviteCode & V>(v, id, hashInviteCode)
 }
 
-export function validateInviteCode(v: unknown) {
-  return lexicons.validate(
-    `${id}#inviteCode`,
-    v,
-  ) as ValidationResult<InviteCode>
+export function isValidInviteCode<V>(v: V) {
+  return isValid<InviteCode>(v, id, hashInviteCode)
 }
 
 export interface InviteCodeUse {
+  $type?: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
   usedBy: string
   usedAt: string
-  [k: string]: unknown
 }
 
-export function isInviteCodeUse(
-  v: unknown,
-): v is InviteCodeUse & {
-  $type: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
-} {
-  return is$typed(v, id, 'inviteCodeUse')
+const hashInviteCodeUse = 'inviteCodeUse'
+
+export function isInviteCodeUse<V>(v: V) {
+  return is$typed(v, id, hashInviteCodeUse)
+}
+
+export function validateInviteCodeUse<V>(v: V) {
+  return validate<InviteCodeUse & V>(v, id, hashInviteCodeUse)
 }
 
-export function validateInviteCodeUse(v: unknown) {
-  return lexicons.validate(
-    `${id}#inviteCodeUse`,
-    v,
-  ) as ValidationResult<InviteCodeUse>
+export function isValidInviteCodeUse<V>(v: V) {
+  return isValid<InviteCodeUse>(v, id, hashInviteCodeUse)
 }
diff --git a/packages/api/src/client/types/com/atproto/server/deleteAccount.ts b/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
index cfb2a008489..66c99f3f9e0 100644
--- a/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deleteAccount'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface InputSchema {
   did: string
   password: string
   token: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/deleteSession.ts b/packages/api/src/client/types/com/atproto/server/deleteSession.ts
index afd107a8eb6..9590ada850d 100644
--- a/packages/api/src/client/types/com/atproto/server/deleteSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/deleteSession.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deleteSession'
 
 export interface QueryParams {}
diff --git a/packages/api/src/client/types/com/atproto/server/describeServer.ts b/packages/api/src/client/types/com/atproto/server/describeServer.ts
index 4b757c5f7ee..ed79f3a3cf7 100644
--- a/packages/api/src/client/types/com/atproto/server/describeServer.ts
+++ b/packages/api/src/client/types/com/atproto/server/describeServer.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.describeServer'
 
 export interface QueryParams {}
@@ -23,7 +29,6 @@ export interface OutputSchema {
   links?: Links
   contact?: Contact
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -42,34 +47,40 @@ export function toKnownErr(e: any) {
 }
 
 export interface Links {
+  $type?: $Type<'com.atproto.server.describeServer', 'links'>
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(
-  v: unknown,
-): v is Links & { $type: $Type<'com.atproto.server.describeServer', 'links'> } {
-  return is$typed(v, id, 'links')
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
+}
+
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown) {
-  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
+export function isValidLinks<V>(v: V) {
+  return isValid<Links>(v, id, hashLinks)
 }
 
 export interface Contact {
+  $type?: $Type<'com.atproto.server.describeServer', 'contact'>
   email?: string
-  [k: string]: unknown
 }
 
-export function isContact(
-  v: unknown,
-): v is Contact & {
-  $type: $Type<'com.atproto.server.describeServer', 'contact'>
-} {
-  return is$typed(v, id, 'contact')
+const hashContact = 'contact'
+
+export function isContact<V>(v: V) {
+  return is$typed(v, id, hashContact)
+}
+
+export function validateContact<V>(v: V) {
+  return validate<Contact & V>(v, id, hashContact)
 }
 
-export function validateContact(v: unknown) {
-  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
+export function isValidContact<V>(v: V) {
+  return isValid<Contact>(v, id, hashContact)
 }
diff --git a/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts b/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
index b4673c894d3..6efe1a21ac4 100644
--- a/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoServerDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getAccountInviteCodes'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts b/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
index 737f3302dbb..934a27768d7 100644
--- a/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getServiceAuth'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   token: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/getSession.ts b/packages/api/src/client/types/com/atproto/server/getSession.ts
index b1175d6d5a3..5fb8af29d0b 100644
--- a/packages/api/src/client/types/com/atproto/server/getSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/getSession.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getSession'
 
 export interface QueryParams {}
@@ -19,11 +25,10 @@ export interface OutputSchema {
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts b/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
index 2f47e52aa68..9a15d1ca27e 100644
--- a/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.listAppPasswords'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   passwords: AppPassword[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -44,23 +49,22 @@ export function toKnownErr(e: any) {
 }
 
 export interface AppPassword {
+  $type?: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
   name: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(
-  v: unknown,
-): v is AppPassword & {
-  $type: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
-} {
-  return is$typed(v, id, 'appPassword')
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
+}
+
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown) {
-  return lexicons.validate(
-    `${id}#appPassword`,
-    v,
-  ) as ValidationResult<AppPassword>
+export function isValidAppPassword<V>(v: V) {
+  return isValid<AppPassword>(v, id, hashAppPassword)
 }
diff --git a/packages/api/src/client/types/com/atproto/server/refreshSession.ts b/packages/api/src/client/types/com/atproto/server/refreshSession.ts
index f5fee9f2325..76fc9f30a39 100644
--- a/packages/api/src/client/types/com/atproto/server/refreshSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/refreshSession.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.refreshSession'
 
 export interface QueryParams {}
@@ -18,11 +24,10 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** Hosting status of the account. If not specified, then assume 'active'. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts b/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
index 34b2f39f6e0..53b2b56849d 100644
--- a/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestAccountDelete'
 
 export interface QueryParams {}
diff --git a/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts b/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
index 82df373be9b..d09cd86bf21 100644
--- a/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestEmailConfirmation'
 
 export interface QueryParams {}
diff --git a/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts b/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
index 7b8e57b1ad3..b68cff52cd9 100644
--- a/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestEmailUpdate'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   tokenRequired: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts b/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
index 7dcbd543d05..c966c6db2ca 100644
--- a/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestPasswordReset'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts b/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
index 17cba425af0..1e1dceb3d58 100644
--- a/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.reserveSigningKey'
 
 export interface QueryParams {}
@@ -14,13 +20,11 @@ export interface QueryParams {}
 export interface InputSchema {
   /** The DID to reserve a key for. */
   did?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   /** The public key for the reserved signing key, in did:key serialization. */
   signingKey: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/resetPassword.ts b/packages/api/src/client/types/com/atproto/server/resetPassword.ts
index 9c93098dfb9..b15954f73c3 100644
--- a/packages/api/src/client/types/com/atproto/server/resetPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/resetPassword.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.resetPassword'
 
 export interface QueryParams {}
@@ -14,7 +20,6 @@ export interface QueryParams {}
 export interface InputSchema {
   token: string
   password: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts b/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
index ae10caa7e18..dffb0f935e2 100644
--- a/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.revokeAppPassword'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   name: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/updateEmail.ts b/packages/api/src/client/types/com/atproto/server/updateEmail.ts
index 8d52c2446bc..e772d001c1b 100644
--- a/packages/api/src/client/types/com/atproto/server/updateEmail.ts
+++ b/packages/api/src/client/types/com/atproto/server/updateEmail.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.updateEmail'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   emailAuthFactor?: boolean
   /** Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. */
   token?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/getBlob.ts b/packages/api/src/client/types/com/atproto/sync/getBlob.ts
index d434b91aa3f..1032e0a7128 100644
--- a/packages/api/src/client/types/com/atproto/sync/getBlob.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getBlob.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getBlob'
 
 export interface QueryParams {
diff --git a/packages/api/src/client/types/com/atproto/sync/getBlocks.ts b/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
index 737cda35ba4..0a391826011 100644
--- a/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getBlocks'
 
 export interface QueryParams {
diff --git a/packages/api/src/client/types/com/atproto/sync/getCheckout.ts b/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
index 15ed26fc973..01260c4066c 100644
--- a/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getCheckout'
 
 export interface QueryParams {
diff --git a/packages/api/src/client/types/com/atproto/sync/getHead.ts b/packages/api/src/client/types/com/atproto/sync/getHead.ts
index 8edb810cff9..8fc2ee827ca 100644
--- a/packages/api/src/client/types/com/atproto/sync/getHead.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getHead.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getHead'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts b/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
index 334ecd16a62..c24ce8bbdde 100644
--- a/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getLatestCommit'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/getRecord.ts b/packages/api/src/client/types/com/atproto/sync/getRecord.ts
index 5aa0133fd8a..e6c26b26bef 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRecord.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRecord.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRecord'
 
 export interface QueryParams {
diff --git a/packages/api/src/client/types/com/atproto/sync/getRepo.ts b/packages/api/src/client/types/com/atproto/sync/getRepo.ts
index aced8c2bd22..d2333d280f5 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRepo.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRepo.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRepo'
 
 export interface QueryParams {
diff --git a/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts b/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
index e208e3ed50c..f12385def0e 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRepoStatus'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/listBlobs.ts b/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
index 0e7f097d514..423a5a2e726 100644
--- a/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
+++ b/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.listBlobs'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   cids: string[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/listRepos.ts b/packages/api/src/client/types/com/atproto/sync/listRepos.ts
index 11cd0b9a341..037d74b16b8 100644
--- a/packages/api/src/client/types/com/atproto/sync/listRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/listRepos.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.listRepos'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: Repo[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -38,6 +43,7 @@ export function toKnownErr(e: any) {
 }
 
 export interface Repo {
+  $type?: $Type<'com.atproto.sync.listRepos', 'repo'>
   did: string
   /** Current repo commit CID */
   head: string
@@ -45,15 +51,18 @@ export interface Repo {
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isRepo(
-  v: unknown,
-): v is Repo & { $type: $Type<'com.atproto.sync.listRepos', 'repo'> } {
-  return is$typed(v, id, 'repo')
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
+}
+
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
 }
 
-export function validateRepo(v: unknown) {
-  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
+export function isValidRepo<V>(v: V) {
+  return isValid<Repo>(v, id, hashRepo)
 }
diff --git a/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts b/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
index 86bad80f25f..881f7e9d8ec 100644
--- a/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.notifyOfUpdate'
 
 export interface QueryParams {}
@@ -14,7 +20,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Hostname of the current service (usually a PDS) that is notifying of update. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts b/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
index c3bfedd5445..c42eb38e3a1 100644
--- a/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.requestCrawl'
 
 export interface QueryParams {}
@@ -14,7 +20,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Hostname of the current service (eg, PDS) that is requesting to be crawled. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
index 95ed476e044..d86885ac4e0 100644
--- a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
@@ -4,13 +4,20 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.subscribeRepos'
 
 /** Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. */
 export interface Commit {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'commit'>
   /** The stream sequence number of this message. */
   seq: number
   /** DEPRECATED -- unused */
@@ -33,43 +40,49 @@ export interface Commit {
   blobs: CID[]
   /** Timestamp of when this message was originally broadcast. */
   time: string
-  [k: string]: unknown
 }
 
-export function isCommit(
-  v: unknown,
-): v is Commit & { $type: $Type<'com.atproto.sync.subscribeRepos', 'commit'> } {
-  return is$typed(v, id, 'commit')
+const hashCommit = 'commit'
+
+export function isCommit<V>(v: V) {
+  return is$typed(v, id, hashCommit)
+}
+
+export function validateCommit<V>(v: V) {
+  return validate<Commit & V>(v, id, hashCommit)
 }
 
-export function validateCommit(v: unknown) {
-  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
+export function isValidCommit<V>(v: V) {
+  return isValid<Commit>(v, id, hashCommit)
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
   seq: number
   did: string
   time: string
   /** The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details. */
   handle?: string
-  [k: string]: unknown
 }
 
-export function isIdentity(
-  v: unknown,
-): v is Identity & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
-} {
-  return is$typed(v, id, 'identity')
+const hashIdentity = 'identity'
+
+export function isIdentity<V>(v: V) {
+  return is$typed(v, id, hashIdentity)
+}
+
+export function validateIdentity<V>(v: V) {
+  return validate<Identity & V>(v, id, hashIdentity)
 }
 
-export function validateIdentity(v: unknown) {
-  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
+export function isValidIdentity<V>(v: V) {
+  return isValid<Identity>(v, id, hashIdentity)
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
 export interface Account {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'account'>
   seq: number
   did: string
   time: string
@@ -77,112 +90,129 @@ export interface Account {
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
   status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isAccount(
-  v: unknown,
-): v is Account & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'account'>
-} {
-  return is$typed(v, id, 'account')
+const hashAccount = 'account'
+
+export function isAccount<V>(v: V) {
+  return is$typed(v, id, hashAccount)
+}
+
+export function validateAccount<V>(v: V) {
+  return validate<Account & V>(v, id, hashAccount)
 }
 
-export function validateAccount(v: unknown) {
-  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
+export function isValidAccount<V>(v: V) {
+  return isValid<Account>(v, id, hashAccount)
 }
 
 /** DEPRECATED -- Use #identity event instead */
 export interface Handle {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'handle'>
   seq: number
   did: string
   handle: string
   time: string
-  [k: string]: unknown
 }
 
-export function isHandle(
-  v: unknown,
-): v is Handle & { $type: $Type<'com.atproto.sync.subscribeRepos', 'handle'> } {
-  return is$typed(v, id, 'handle')
+const hashHandle = 'handle'
+
+export function isHandle<V>(v: V) {
+  return is$typed(v, id, hashHandle)
+}
+
+export function validateHandle<V>(v: V) {
+  return validate<Handle & V>(v, id, hashHandle)
 }
 
-export function validateHandle(v: unknown) {
-  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
+export function isValidHandle<V>(v: V) {
+  return isValid<Handle>(v, id, hashHandle)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Migrate {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
   seq: number
   did: string
   migrateTo: string | null
   time: string
-  [k: string]: unknown
 }
 
-export function isMigrate(
-  v: unknown,
-): v is Migrate & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
-} {
-  return is$typed(v, id, 'migrate')
+const hashMigrate = 'migrate'
+
+export function isMigrate<V>(v: V) {
+  return is$typed(v, id, hashMigrate)
+}
+
+export function validateMigrate<V>(v: V) {
+  return validate<Migrate & V>(v, id, hashMigrate)
 }
 
-export function validateMigrate(v: unknown) {
-  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
+export function isValidMigrate<V>(v: V) {
+  return isValid<Migrate>(v, id, hashMigrate)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Tombstone {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
   seq: number
   did: string
   time: string
-  [k: string]: unknown
 }
 
-export function isTombstone(
-  v: unknown,
-): v is Tombstone & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
-} {
-  return is$typed(v, id, 'tombstone')
+const hashTombstone = 'tombstone'
+
+export function isTombstone<V>(v: V) {
+  return is$typed(v, id, hashTombstone)
+}
+
+export function validateTombstone<V>(v: V) {
+  return validate<Tombstone & V>(v, id, hashTombstone)
 }
 
-export function validateTombstone(v: unknown) {
-  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
+export function isValidTombstone<V>(v: V) {
+  return isValid<Tombstone>(v, id, hashTombstone)
 }
 
 export interface Info {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'info'>
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(
-  v: unknown,
-): v is Info & { $type: $Type<'com.atproto.sync.subscribeRepos', 'info'> } {
-  return is$typed(v, id, 'info')
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
+}
+
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown) {
-  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
+export function isValidInfo<V>(v: V) {
+  return isValid<Info>(v, id, hashInfo)
 }
 
 /** A repo operation, ie a mutation of a single record. */
 export interface RepoOp {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'>
   action: 'create' | 'update' | 'delete' | (string & {})
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  [k: string]: unknown
 }
 
-export function isRepoOp(
-  v: unknown,
-): v is RepoOp & { $type: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'> } {
-  return is$typed(v, id, 'repoOp')
+const hashRepoOp = 'repoOp'
+
+export function isRepoOp<V>(v: V) {
+  return is$typed(v, id, hashRepoOp)
+}
+
+export function validateRepoOp<V>(v: V) {
+  return validate<RepoOp & V>(v, id, hashRepoOp)
 }
 
-export function validateRepoOp(v: unknown) {
-  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
+export function isValidRepoOp<V>(v: V) {
+  return isValid<RepoOp>(v, id, hashRepoOp)
 }
diff --git a/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts b/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts
index 0bccbba47dc..961e792b1a8 100644
--- a/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts
@@ -4,21 +4,24 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.addReservedHandle'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   handle: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface CallOptions {
   signal?: AbortSignal
diff --git a/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts b/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
index 64f54444e4c..f99c2c862d1 100644
--- a/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.checkSignupQueue'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface OutputSchema {
   activated: boolean
   placeInQueue?: number
   estimatedTimeMs?: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts b/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
index 2d1ff2e0483..0c39b1b793d 100644
--- a/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoLabelDefs from '../label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.fetchLabels'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts b/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
index 350d5bb9e98..c2b262f1e34 100644
--- a/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.requestPhoneVerification'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   phoneNumber: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts b/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
index c52616efd8c..9de6abe6c3d 100644
--- a/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneCommunicationDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneCommunicationDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.createTemplate'
 
 export interface QueryParams {}
@@ -23,7 +29,6 @@ export interface InputSchema {
   lang?: string
   /** DID of the user who is creating the template. */
   createdBy?: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/api/src/client/types/tools/ozone/communication/defs.ts b/packages/api/src/client/types/tools/ozone/communication/defs.ts
index ff931a61478..7cc4568c002 100644
--- a/packages/api/src/client/types/tools/ozone/communication/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
+  $type?: $Type<'tools.ozone.communication.defs', 'templateView'>
   id: string
   /** Name of the template. */
   name: string
@@ -23,20 +30,18 @@ export interface TemplateView {
   lastUpdatedBy: string
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isTemplateView(
-  v: unknown,
-): v is TemplateView & {
-  $type: $Type<'tools.ozone.communication.defs', 'templateView'>
-} {
-  return is$typed(v, id, 'templateView')
+const hashTemplateView = 'templateView'
+
+export function isTemplateView<V>(v: V) {
+  return is$typed(v, id, hashTemplateView)
+}
+
+export function validateTemplateView<V>(v: V) {
+  return validate<TemplateView & V>(v, id, hashTemplateView)
 }
 
-export function validateTemplateView(v: unknown) {
-  return lexicons.validate(
-    `${id}#templateView`,
-    v,
-  ) as ValidationResult<TemplateView>
+export function isValidTemplateView<V>(v: V) {
+  return isValid<TemplateView>(v, id, hashTemplateView)
 }
diff --git a/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts b/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
index ee4a9d10ce6..79364aadcf6 100644
--- a/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.deleteTemplate'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   id: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts b/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
index 765ed10524b..ca047784768 100644
--- a/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneCommunicationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.listTemplates'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   communicationTemplates: ToolsOzoneCommunicationDefs.TemplateView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts b/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
index 033bd342712..76267d5782c 100644
--- a/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneCommunicationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.updateTemplate'
 
 export interface QueryParams {}
@@ -26,7 +32,6 @@ export interface InputSchema {
   /** DID of the user who is updating the template. */
   updatedBy?: string
   disabled?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/api/src/client/types/tools/ozone/moderation/defs.ts b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
index 6c49cddba04..b835c20d110 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -3,126 +3,128 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
-import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
-import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
+import type * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.defs'
 
 export interface ModEventView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventView'>
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ChatBskyConvoDefs.MessageRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ChatBskyConvoDefs.MessageRef>
+    | { $type: string }
   subjectBlobCids: string[]
   createdBy: string
   createdAt: string
   creatorHandle?: string
   subjectHandle?: string
-  [k: string]: unknown
 }
 
-export function isModEventView(
-  v: unknown,
-): v is ModEventView & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventView'>
-} {
-  return is$typed(v, id, 'modEventView')
+const hashModEventView = 'modEventView'
+
+export function isModEventView<V>(v: V) {
+  return is$typed(v, id, hashModEventView)
 }
 
-export function validateModEventView(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventView`,
-    v,
-  ) as ValidationResult<ModEventView>
+export function validateModEventView<V>(v: V) {
+  return validate<ModEventView & V>(v, id, hashModEventView)
+}
+
+export function isValidModEventView<V>(v: V) {
+  return isValid<ModEventView>(v, id, hashModEventView)
 }
 
 export interface ModEventViewDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventViewDetail'>
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | { $type: string }
   subject:
-    | RepoView
-    | RepoViewNotFound
-    | RecordView
-    | RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<RepoView>
+    | $Typed<RepoViewNotFound>
+    | $Typed<RecordView>
+    | $Typed<RecordViewNotFound>
+    | { $type: string }
   subjectBlobs: BlobView[]
   createdBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
-export function isModEventViewDetail(
-  v: unknown,
-): v is ModEventViewDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventViewDetail'>
-} {
-  return is$typed(v, id, 'modEventViewDetail')
+const hashModEventViewDetail = 'modEventViewDetail'
+
+export function isModEventViewDetail<V>(v: V) {
+  return is$typed(v, id, hashModEventViewDetail)
 }
 
-export function validateModEventViewDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventViewDetail`,
-    v,
-  ) as ValidationResult<ModEventViewDetail>
+export function validateModEventViewDetail<V>(v: V) {
+  return validate<ModEventViewDetail & V>(v, id, hashModEventViewDetail)
+}
+
+export function isValidModEventViewDetail<V>(v: V) {
+  return isValid<ModEventViewDetail>(v, id, hashModEventViewDetail)
 }
 
 export interface SubjectStatusView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'subjectStatusView'>
   id: number
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  hosting?:
-    | AccountHosting
-    | RecordHosting
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
+  hosting?: $Typed<AccountHosting> | $Typed<RecordHosting> | { $type: string }
   subjectBlobCids?: string[]
   subjectRepoHandle?: string
   /** Timestamp referencing when the last update was made to the moderation status of the subject */
@@ -144,22 +146,20 @@ export interface SubjectStatusView {
   appealed?: boolean
   suspendUntil?: string
   tags?: string[]
-  [k: string]: unknown
 }
 
-export function isSubjectStatusView(
-  v: unknown,
-): v is SubjectStatusView & {
-  $type: $Type<'tools.ozone.moderation.defs', 'subjectStatusView'>
-} {
-  return is$typed(v, id, 'subjectStatusView')
+const hashSubjectStatusView = 'subjectStatusView'
+
+export function isSubjectStatusView<V>(v: V) {
+  return is$typed(v, id, hashSubjectStatusView)
 }
 
-export function validateSubjectStatusView(v: unknown) {
-  return lexicons.validate(
-    `${id}#subjectStatusView`,
-    v,
-  ) as ValidationResult<SubjectStatusView>
+export function validateSubjectStatusView<V>(v: V) {
+  return validate<SubjectStatusView & V>(v, id, hashSubjectStatusView)
+}
+
+export function isValidSubjectStatusView<V>(v: V) {
+  return isValid<SubjectStatusView>(v, id, hashSubjectStatusView)
 }
 
 export type SubjectReviewState =
@@ -180,350 +180,340 @@ export const REVIEWNONE = `${id}#reviewNone`
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventTakedown'>
   comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
   acknowledgeAccountSubjects?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventTakedown(
-  v: unknown,
-): v is ModEventTakedown & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventTakedown'>
-} {
-  return is$typed(v, id, 'modEventTakedown')
+const hashModEventTakedown = 'modEventTakedown'
+
+export function isModEventTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventTakedown)
 }
 
-export function validateModEventTakedown(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventTakedown`,
-    v,
-  ) as ValidationResult<ModEventTakedown>
+export function validateModEventTakedown<V>(v: V) {
+  return validate<ModEventTakedown & V>(v, id, hashModEventTakedown)
+}
+
+export function isValidModEventTakedown<V>(v: V) {
+  return isValid<ModEventTakedown>(v, id, hashModEventTakedown)
 }
 
 /** Revert take down action on a subject */
 export interface ModEventReverseTakedown {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventReverseTakedown'>
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventReverseTakedown(
-  v: unknown,
-): v is ModEventReverseTakedown & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventReverseTakedown'>
-} {
-  return is$typed(v, id, 'modEventReverseTakedown')
+const hashModEventReverseTakedown = 'modEventReverseTakedown'
+
+export function isModEventReverseTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventReverseTakedown)
 }
 
-export function validateModEventReverseTakedown(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventReverseTakedown`,
+export function validateModEventReverseTakedown<V>(v: V) {
+  return validate<ModEventReverseTakedown & V>(
     v,
-  ) as ValidationResult<ModEventReverseTakedown>
+    id,
+    hashModEventReverseTakedown,
+  )
+}
+
+export function isValidModEventReverseTakedown<V>(v: V) {
+  return isValid<ModEventReverseTakedown>(v, id, hashModEventReverseTakedown)
 }
 
 /** Resolve appeal on a subject */
 export interface ModEventResolveAppeal {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventResolveAppeal'>
   /** Describe resolution. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventResolveAppeal(
-  v: unknown,
-): v is ModEventResolveAppeal & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventResolveAppeal'>
-} {
-  return is$typed(v, id, 'modEventResolveAppeal')
+const hashModEventResolveAppeal = 'modEventResolveAppeal'
+
+export function isModEventResolveAppeal<V>(v: V) {
+  return is$typed(v, id, hashModEventResolveAppeal)
 }
 
-export function validateModEventResolveAppeal(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventResolveAppeal`,
-    v,
-  ) as ValidationResult<ModEventResolveAppeal>
+export function validateModEventResolveAppeal<V>(v: V) {
+  return validate<ModEventResolveAppeal & V>(v, id, hashModEventResolveAppeal)
+}
+
+export function isValidModEventResolveAppeal<V>(v: V) {
+  return isValid<ModEventResolveAppeal>(v, id, hashModEventResolveAppeal)
 }
 
 /** Add a comment to a subject */
 export interface ModEventComment {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventComment'>
   comment: string
   /** Make the comment persistent on the subject */
   sticky?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventComment(
-  v: unknown,
-): v is ModEventComment & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventComment'>
-} {
-  return is$typed(v, id, 'modEventComment')
+const hashModEventComment = 'modEventComment'
+
+export function isModEventComment<V>(v: V) {
+  return is$typed(v, id, hashModEventComment)
 }
 
-export function validateModEventComment(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventComment`,
-    v,
-  ) as ValidationResult<ModEventComment>
+export function validateModEventComment<V>(v: V) {
+  return validate<ModEventComment & V>(v, id, hashModEventComment)
+}
+
+export function isValidModEventComment<V>(v: V) {
+  return isValid<ModEventComment>(v, id, hashModEventComment)
 }
 
 /** Report a subject */
 export interface ModEventReport {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventReport'>
   comment?: string
   /** Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject. */
   isReporterMuted?: boolean
   reportType: ComAtprotoModerationDefs.ReasonType
-  [k: string]: unknown
 }
 
-export function isModEventReport(
-  v: unknown,
-): v is ModEventReport & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventReport'>
-} {
-  return is$typed(v, id, 'modEventReport')
+const hashModEventReport = 'modEventReport'
+
+export function isModEventReport<V>(v: V) {
+  return is$typed(v, id, hashModEventReport)
 }
 
-export function validateModEventReport(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventReport`,
-    v,
-  ) as ValidationResult<ModEventReport>
+export function validateModEventReport<V>(v: V) {
+  return validate<ModEventReport & V>(v, id, hashModEventReport)
+}
+
+export function isValidModEventReport<V>(v: V) {
+  return isValid<ModEventReport>(v, id, hashModEventReport)
 }
 
 /** Apply/Negate labels on a subject */
 export interface ModEventLabel {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventLabel'>
   comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
-  [k: string]: unknown
 }
 
-export function isModEventLabel(
-  v: unknown,
-): v is ModEventLabel & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventLabel'>
-} {
-  return is$typed(v, id, 'modEventLabel')
+const hashModEventLabel = 'modEventLabel'
+
+export function isModEventLabel<V>(v: V) {
+  return is$typed(v, id, hashModEventLabel)
 }
 
-export function validateModEventLabel(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventLabel`,
-    v,
-  ) as ValidationResult<ModEventLabel>
+export function validateModEventLabel<V>(v: V) {
+  return validate<ModEventLabel & V>(v, id, hashModEventLabel)
+}
+
+export function isValidModEventLabel<V>(v: V) {
+  return isValid<ModEventLabel>(v, id, hashModEventLabel)
 }
 
 export interface ModEventAcknowledge {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventAcknowledge'>
   comment?: string
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
   acknowledgeAccountSubjects?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventAcknowledge(
-  v: unknown,
-): v is ModEventAcknowledge & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventAcknowledge'>
-} {
-  return is$typed(v, id, 'modEventAcknowledge')
+const hashModEventAcknowledge = 'modEventAcknowledge'
+
+export function isModEventAcknowledge<V>(v: V) {
+  return is$typed(v, id, hashModEventAcknowledge)
 }
 
-export function validateModEventAcknowledge(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventAcknowledge`,
-    v,
-  ) as ValidationResult<ModEventAcknowledge>
+export function validateModEventAcknowledge<V>(v: V) {
+  return validate<ModEventAcknowledge & V>(v, id, hashModEventAcknowledge)
+}
+
+export function isValidModEventAcknowledge<V>(v: V) {
+  return isValid<ModEventAcknowledge>(v, id, hashModEventAcknowledge)
 }
 
 export interface ModEventEscalate {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventEscalate'>
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEscalate(
-  v: unknown,
-): v is ModEventEscalate & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventEscalate'>
-} {
-  return is$typed(v, id, 'modEventEscalate')
+const hashModEventEscalate = 'modEventEscalate'
+
+export function isModEventEscalate<V>(v: V) {
+  return is$typed(v, id, hashModEventEscalate)
 }
 
-export function validateModEventEscalate(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventEscalate`,
-    v,
-  ) as ValidationResult<ModEventEscalate>
+export function validateModEventEscalate<V>(v: V) {
+  return validate<ModEventEscalate & V>(v, id, hashModEventEscalate)
+}
+
+export function isValidModEventEscalate<V>(v: V) {
+  return isValid<ModEventEscalate>(v, id, hashModEventEscalate)
 }
 
 /** Mute incoming reports on a subject */
 export interface ModEventMute {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventMute'>
   comment?: string
   /** Indicates how long the subject should remain muted. */
   durationInHours: number
-  [k: string]: unknown
 }
 
-export function isModEventMute(
-  v: unknown,
-): v is ModEventMute & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventMute'>
-} {
-  return is$typed(v, id, 'modEventMute')
+const hashModEventMute = 'modEventMute'
+
+export function isModEventMute<V>(v: V) {
+  return is$typed(v, id, hashModEventMute)
 }
 
-export function validateModEventMute(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventMute`,
-    v,
-  ) as ValidationResult<ModEventMute>
+export function validateModEventMute<V>(v: V) {
+  return validate<ModEventMute & V>(v, id, hashModEventMute)
+}
+
+export function isValidModEventMute<V>(v: V) {
+  return isValid<ModEventMute>(v, id, hashModEventMute)
 }
 
 /** Unmute action on a subject */
 export interface ModEventUnmute {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventUnmute'>
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmute(
-  v: unknown,
-): v is ModEventUnmute & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmute'>
-} {
-  return is$typed(v, id, 'modEventUnmute')
+const hashModEventUnmute = 'modEventUnmute'
+
+export function isModEventUnmute<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmute)
 }
 
-export function validateModEventUnmute(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventUnmute`,
-    v,
-  ) as ValidationResult<ModEventUnmute>
+export function validateModEventUnmute<V>(v: V) {
+  return validate<ModEventUnmute & V>(v, id, hashModEventUnmute)
+}
+
+export function isValidModEventUnmute<V>(v: V) {
+  return isValid<ModEventUnmute>(v, id, hashModEventUnmute)
 }
 
 /** Mute incoming reports from an account */
 export interface ModEventMuteReporter {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventMuteReporter'>
   comment?: string
   /** Indicates how long the account should remain muted. Falsy value here means a permanent mute. */
   durationInHours?: number
-  [k: string]: unknown
 }
 
-export function isModEventMuteReporter(
-  v: unknown,
-): v is ModEventMuteReporter & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventMuteReporter'>
-} {
-  return is$typed(v, id, 'modEventMuteReporter')
+const hashModEventMuteReporter = 'modEventMuteReporter'
+
+export function isModEventMuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventMuteReporter)
 }
 
-export function validateModEventMuteReporter(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventMuteReporter`,
-    v,
-  ) as ValidationResult<ModEventMuteReporter>
+export function validateModEventMuteReporter<V>(v: V) {
+  return validate<ModEventMuteReporter & V>(v, id, hashModEventMuteReporter)
+}
+
+export function isValidModEventMuteReporter<V>(v: V) {
+  return isValid<ModEventMuteReporter>(v, id, hashModEventMuteReporter)
 }
 
 /** Unmute incoming reports from an account */
 export interface ModEventUnmuteReporter {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventUnmuteReporter'>
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmuteReporter(
-  v: unknown,
-): v is ModEventUnmuteReporter & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmuteReporter'>
-} {
-  return is$typed(v, id, 'modEventUnmuteReporter')
+const hashModEventUnmuteReporter = 'modEventUnmuteReporter'
+
+export function isModEventUnmuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmuteReporter)
 }
 
-export function validateModEventUnmuteReporter(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventUnmuteReporter`,
-    v,
-  ) as ValidationResult<ModEventUnmuteReporter>
+export function validateModEventUnmuteReporter<V>(v: V) {
+  return validate<ModEventUnmuteReporter & V>(v, id, hashModEventUnmuteReporter)
+}
+
+export function isValidModEventUnmuteReporter<V>(v: V) {
+  return isValid<ModEventUnmuteReporter>(v, id, hashModEventUnmuteReporter)
 }
 
 /** Keep a log of outgoing email to a user */
 export interface ModEventEmail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventEmail'>
   /** The subject line of the email sent to the user. */
   subjectLine: string
   /** The content of the email sent to the user. */
   content?: string
   /** Additional comment about the outgoing comm. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEmail(
-  v: unknown,
-): v is ModEventEmail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventEmail'>
-} {
-  return is$typed(v, id, 'modEventEmail')
+const hashModEventEmail = 'modEventEmail'
+
+export function isModEventEmail<V>(v: V) {
+  return is$typed(v, id, hashModEventEmail)
 }
 
-export function validateModEventEmail(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventEmail`,
-    v,
-  ) as ValidationResult<ModEventEmail>
+export function validateModEventEmail<V>(v: V) {
+  return validate<ModEventEmail & V>(v, id, hashModEventEmail)
+}
+
+export function isValidModEventEmail<V>(v: V) {
+  return isValid<ModEventEmail>(v, id, hashModEventEmail)
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
 export interface ModEventDivert {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventDivert'>
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventDivert(
-  v: unknown,
-): v is ModEventDivert & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventDivert'>
-} {
-  return is$typed(v, id, 'modEventDivert')
+const hashModEventDivert = 'modEventDivert'
+
+export function isModEventDivert<V>(v: V) {
+  return is$typed(v, id, hashModEventDivert)
 }
 
-export function validateModEventDivert(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventDivert`,
-    v,
-  ) as ValidationResult<ModEventDivert>
+export function validateModEventDivert<V>(v: V) {
+  return validate<ModEventDivert & V>(v, id, hashModEventDivert)
+}
+
+export function isValidModEventDivert<V>(v: V) {
+  return isValid<ModEventDivert>(v, id, hashModEventDivert)
 }
 
 /** Add/Remove a tag on a subject */
 export interface ModEventTag {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventTag'>
   /** Tags to be added to the subject. If already exists, won't be duplicated. */
   add: string[]
   /** Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated. */
   remove: string[]
   /** Additional comment about added/removed tags. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventTag(
-  v: unknown,
-): v is ModEventTag & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventTag'>
-} {
-  return is$typed(v, id, 'modEventTag')
+const hashModEventTag = 'modEventTag'
+
+export function isModEventTag<V>(v: V) {
+  return is$typed(v, id, hashModEventTag)
 }
 
-export function validateModEventTag(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventTag`,
-    v,
-  ) as ValidationResult<ModEventTag>
+export function validateModEventTag<V>(v: V) {
+  return validate<ModEventTag & V>(v, id, hashModEventTag)
+}
+
+export function isValidModEventTag<V>(v: V) {
+  return isValid<ModEventTag>(v, id, hashModEventTag)
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface AccountEvent {
+  $type?: $Type<'tools.ozone.moderation.defs', 'accountEvent'>
   comment?: string
   /** Indicates that the account has a repository which can be fetched from the host that emitted this event. */
   active: boolean
@@ -536,78 +526,75 @@ export interface AccountEvent {
     | 'tombstoned'
     | (string & {})
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isAccountEvent(
-  v: unknown,
-): v is AccountEvent & {
-  $type: $Type<'tools.ozone.moderation.defs', 'accountEvent'>
-} {
-  return is$typed(v, id, 'accountEvent')
+const hashAccountEvent = 'accountEvent'
+
+export function isAccountEvent<V>(v: V) {
+  return is$typed(v, id, hashAccountEvent)
 }
 
-export function validateAccountEvent(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountEvent`,
-    v,
-  ) as ValidationResult<AccountEvent>
+export function validateAccountEvent<V>(v: V) {
+  return validate<AccountEvent & V>(v, id, hashAccountEvent)
+}
+
+export function isValidAccountEvent<V>(v: V) {
+  return isValid<AccountEvent>(v, id, hashAccountEvent)
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface IdentityEvent {
+  $type?: $Type<'tools.ozone.moderation.defs', 'identityEvent'>
   comment?: string
   handle?: string
   pdsHost?: string
   tombstone?: boolean
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isIdentityEvent(
-  v: unknown,
-): v is IdentityEvent & {
-  $type: $Type<'tools.ozone.moderation.defs', 'identityEvent'>
-} {
-  return is$typed(v, id, 'identityEvent')
+const hashIdentityEvent = 'identityEvent'
+
+export function isIdentityEvent<V>(v: V) {
+  return is$typed(v, id, hashIdentityEvent)
 }
 
-export function validateIdentityEvent(v: unknown) {
-  return lexicons.validate(
-    `${id}#identityEvent`,
-    v,
-  ) as ValidationResult<IdentityEvent>
+export function validateIdentityEvent<V>(v: V) {
+  return validate<IdentityEvent & V>(v, id, hashIdentityEvent)
+}
+
+export function isValidIdentityEvent<V>(v: V) {
+  return isValid<IdentityEvent>(v, id, hashIdentityEvent)
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface RecordEvent {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordEvent'>
   comment?: string
   op: 'create' | 'update' | 'delete' | (string & {})
   cid?: string
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isRecordEvent(
-  v: unknown,
-): v is RecordEvent & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordEvent'>
-} {
-  return is$typed(v, id, 'recordEvent')
+const hashRecordEvent = 'recordEvent'
+
+export function isRecordEvent<V>(v: V) {
+  return is$typed(v, id, hashRecordEvent)
 }
 
-export function validateRecordEvent(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordEvent`,
-    v,
-  ) as ValidationResult<RecordEvent>
+export function validateRecordEvent<V>(v: V) {
+  return validate<RecordEvent & V>(v, id, hashRecordEvent)
+}
+
+export function isValidRecordEvent<V>(v: V) {
+  return isValid<RecordEvent>(v, id, hashRecordEvent)
 }
 
 export interface RepoView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'repoView'>
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: Moderation
   invitedBy?: ComAtprotoServerDefs.InviteCode
@@ -615,24 +602,28 @@ export interface RepoView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoView(
-  v: unknown,
-): v is RepoView & { $type: $Type<'tools.ozone.moderation.defs', 'repoView'> } {
-  return is$typed(v, id, 'repoView')
+const hashRepoView = 'repoView'
+
+export function isRepoView<V>(v: V) {
+  return is$typed(v, id, hashRepoView)
+}
+
+export function validateRepoView<V>(v: V) {
+  return validate<RepoView & V>(v, id, hashRepoView)
 }
 
-export function validateRepoView(v: unknown) {
-  return lexicons.validate(`${id}#repoView`, v) as ValidationResult<RepoView>
+export function isValidRepoView<V>(v: V) {
+  return isValid<RepoView>(v, id, hashRepoView)
 }
 
 export interface RepoViewDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'repoViewDetail'>
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: ModerationDetail
   labels?: ComAtprotoLabelDefs.Label[]
@@ -643,224 +634,216 @@ export interface RepoViewDetail {
   emailConfirmedAt?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoViewDetail(
-  v: unknown,
-): v is RepoViewDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'repoViewDetail'>
-} {
-  return is$typed(v, id, 'repoViewDetail')
+const hashRepoViewDetail = 'repoViewDetail'
+
+export function isRepoViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRepoViewDetail)
 }
 
-export function validateRepoViewDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#repoViewDetail`,
-    v,
-  ) as ValidationResult<RepoViewDetail>
+export function validateRepoViewDetail<V>(v: V) {
+  return validate<RepoViewDetail & V>(v, id, hashRepoViewDetail)
+}
+
+export function isValidRepoViewDetail<V>(v: V) {
+  return isValid<RepoViewDetail>(v, id, hashRepoViewDetail)
 }
 
 export interface RepoViewNotFound {
+  $type?: $Type<'tools.ozone.moderation.defs', 'repoViewNotFound'>
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoViewNotFound(
-  v: unknown,
-): v is RepoViewNotFound & {
-  $type: $Type<'tools.ozone.moderation.defs', 'repoViewNotFound'>
-} {
-  return is$typed(v, id, 'repoViewNotFound')
+const hashRepoViewNotFound = 'repoViewNotFound'
+
+export function isRepoViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRepoViewNotFound)
 }
 
-export function validateRepoViewNotFound(v: unknown) {
-  return lexicons.validate(
-    `${id}#repoViewNotFound`,
-    v,
-  ) as ValidationResult<RepoViewNotFound>
+export function validateRepoViewNotFound<V>(v: V) {
+  return validate<RepoViewNotFound & V>(v, id, hashRepoViewNotFound)
+}
+
+export function isValidRepoViewNotFound<V>(v: V) {
+  return isValid<RepoViewNotFound>(v, id, hashRepoViewNotFound)
 }
 
 export interface RecordView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordView'>
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobCids: string[]
   indexedAt: string
   moderation: Moderation
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordView(
-  v: unknown,
-): v is RecordView & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordView'>
-} {
-  return is$typed(v, id, 'recordView')
+const hashRecordView = 'recordView'
+
+export function isRecordView<V>(v: V) {
+  return is$typed(v, id, hashRecordView)
 }
 
-export function validateRecordView(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordView`,
-    v,
-  ) as ValidationResult<RecordView>
+export function validateRecordView<V>(v: V) {
+  return validate<RecordView & V>(v, id, hashRecordView)
+}
+
+export function isValidRecordView<V>(v: V) {
+  return isValid<RecordView>(v, id, hashRecordView)
 }
 
 export interface RecordViewDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordViewDetail'>
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobs: BlobView[]
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
   moderation: ModerationDetail
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordViewDetail(
-  v: unknown,
-): v is RecordViewDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordViewDetail'>
-} {
-  return is$typed(v, id, 'recordViewDetail')
+const hashRecordViewDetail = 'recordViewDetail'
+
+export function isRecordViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRecordViewDetail)
 }
 
-export function validateRecordViewDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordViewDetail`,
-    v,
-  ) as ValidationResult<RecordViewDetail>
+export function validateRecordViewDetail<V>(v: V) {
+  return validate<RecordViewDetail & V>(v, id, hashRecordViewDetail)
+}
+
+export function isValidRecordViewDetail<V>(v: V) {
+  return isValid<RecordViewDetail>(v, id, hashRecordViewDetail)
 }
 
 export interface RecordViewNotFound {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordViewNotFound'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isRecordViewNotFound(
-  v: unknown,
-): v is RecordViewNotFound & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordViewNotFound'>
-} {
-  return is$typed(v, id, 'recordViewNotFound')
+const hashRecordViewNotFound = 'recordViewNotFound'
+
+export function isRecordViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRecordViewNotFound)
 }
 
-export function validateRecordViewNotFound(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordViewNotFound`,
-    v,
-  ) as ValidationResult<RecordViewNotFound>
+export function validateRecordViewNotFound<V>(v: V) {
+  return validate<RecordViewNotFound & V>(v, id, hashRecordViewNotFound)
+}
+
+export function isValidRecordViewNotFound<V>(v: V) {
+  return isValid<RecordViewNotFound>(v, id, hashRecordViewNotFound)
 }
 
 export interface Moderation {
+  $type?: $Type<'tools.ozone.moderation.defs', 'moderation'>
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModeration(
-  v: unknown,
-): v is Moderation & {
-  $type: $Type<'tools.ozone.moderation.defs', 'moderation'>
-} {
-  return is$typed(v, id, 'moderation')
+const hashModeration = 'moderation'
+
+export function isModeration<V>(v: V) {
+  return is$typed(v, id, hashModeration)
 }
 
-export function validateModeration(v: unknown) {
-  return lexicons.validate(
-    `${id}#moderation`,
-    v,
-  ) as ValidationResult<Moderation>
+export function validateModeration<V>(v: V) {
+  return validate<Moderation & V>(v, id, hashModeration)
+}
+
+export function isValidModeration<V>(v: V) {
+  return isValid<Moderation>(v, id, hashModeration)
 }
 
 export interface ModerationDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'moderationDetail'>
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModerationDetail(
-  v: unknown,
-): v is ModerationDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'moderationDetail'>
-} {
-  return is$typed(v, id, 'moderationDetail')
+const hashModerationDetail = 'moderationDetail'
+
+export function isModerationDetail<V>(v: V) {
+  return is$typed(v, id, hashModerationDetail)
 }
 
-export function validateModerationDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#moderationDetail`,
-    v,
-  ) as ValidationResult<ModerationDetail>
+export function validateModerationDetail<V>(v: V) {
+  return validate<ModerationDetail & V>(v, id, hashModerationDetail)
+}
+
+export function isValidModerationDetail<V>(v: V) {
+  return isValid<ModerationDetail>(v, id, hashModerationDetail)
 }
 
 export interface BlobView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'blobView'>
   cid: string
   mimeType: string
   size: number
   createdAt: string
-  details?:
-    | ImageDetails
-    | VideoDetails
-    | { $type: string; [k: string]: unknown }
+  details?: $Typed<ImageDetails> | $Typed<VideoDetails> | { $type: string }
   moderation?: Moderation
-  [k: string]: unknown
 }
 
-export function isBlobView(
-  v: unknown,
-): v is BlobView & { $type: $Type<'tools.ozone.moderation.defs', 'blobView'> } {
-  return is$typed(v, id, 'blobView')
+const hashBlobView = 'blobView'
+
+export function isBlobView<V>(v: V) {
+  return is$typed(v, id, hashBlobView)
+}
+
+export function validateBlobView<V>(v: V) {
+  return validate<BlobView & V>(v, id, hashBlobView)
 }
 
-export function validateBlobView(v: unknown) {
-  return lexicons.validate(`${id}#blobView`, v) as ValidationResult<BlobView>
+export function isValidBlobView<V>(v: V) {
+  return isValid<BlobView>(v, id, hashBlobView)
 }
 
 export interface ImageDetails {
+  $type?: $Type<'tools.ozone.moderation.defs', 'imageDetails'>
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isImageDetails(
-  v: unknown,
-): v is ImageDetails & {
-  $type: $Type<'tools.ozone.moderation.defs', 'imageDetails'>
-} {
-  return is$typed(v, id, 'imageDetails')
+const hashImageDetails = 'imageDetails'
+
+export function isImageDetails<V>(v: V) {
+  return is$typed(v, id, hashImageDetails)
 }
 
-export function validateImageDetails(v: unknown) {
-  return lexicons.validate(
-    `${id}#imageDetails`,
-    v,
-  ) as ValidationResult<ImageDetails>
+export function validateImageDetails<V>(v: V) {
+  return validate<ImageDetails & V>(v, id, hashImageDetails)
+}
+
+export function isValidImageDetails<V>(v: V) {
+  return isValid<ImageDetails>(v, id, hashImageDetails)
 }
 
 export interface VideoDetails {
+  $type?: $Type<'tools.ozone.moderation.defs', 'videoDetails'>
   width: number
   height: number
   length: number
-  [k: string]: unknown
 }
 
-export function isVideoDetails(
-  v: unknown,
-): v is VideoDetails & {
-  $type: $Type<'tools.ozone.moderation.defs', 'videoDetails'>
-} {
-  return is$typed(v, id, 'videoDetails')
+const hashVideoDetails = 'videoDetails'
+
+export function isVideoDetails<V>(v: V) {
+  return is$typed(v, id, hashVideoDetails)
 }
 
-export function validateVideoDetails(v: unknown) {
-  return lexicons.validate(
-    `${id}#videoDetails`,
-    v,
-  ) as ValidationResult<VideoDetails>
+export function validateVideoDetails<V>(v: V) {
+  return validate<VideoDetails & V>(v, id, hashVideoDetails)
+}
+
+export function isValidVideoDetails<V>(v: V) {
+  return isValid<VideoDetails>(v, id, hashVideoDetails)
 }
 
 export interface AccountHosting {
+  $type?: $Type<'tools.ozone.moderation.defs', 'accountHosting'>
   status:
     | 'takendown'
     | 'suspended'
@@ -873,43 +856,40 @@ export interface AccountHosting {
   deletedAt?: string
   deactivatedAt?: string
   reactivatedAt?: string
-  [k: string]: unknown
 }
 
-export function isAccountHosting(
-  v: unknown,
-): v is AccountHosting & {
-  $type: $Type<'tools.ozone.moderation.defs', 'accountHosting'>
-} {
-  return is$typed(v, id, 'accountHosting')
+const hashAccountHosting = 'accountHosting'
+
+export function isAccountHosting<V>(v: V) {
+  return is$typed(v, id, hashAccountHosting)
 }
 
-export function validateAccountHosting(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountHosting`,
-    v,
-  ) as ValidationResult<AccountHosting>
+export function validateAccountHosting<V>(v: V) {
+  return validate<AccountHosting & V>(v, id, hashAccountHosting)
+}
+
+export function isValidAccountHosting<V>(v: V) {
+  return isValid<AccountHosting>(v, id, hashAccountHosting)
 }
 
 export interface RecordHosting {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordHosting'>
   status: 'deleted' | 'unknown' | (string & {})
   updatedAt?: string
   createdAt?: string
   deletedAt?: string
-  [k: string]: unknown
 }
 
-export function isRecordHosting(
-  v: unknown,
-): v is RecordHosting & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordHosting'>
-} {
-  return is$typed(v, id, 'recordHosting')
+const hashRecordHosting = 'recordHosting'
+
+export function isRecordHosting<V>(v: V) {
+  return is$typed(v, id, hashRecordHosting)
 }
 
-export function validateRecordHosting(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordHosting`,
-    v,
-  ) as ValidationResult<RecordHosting>
+export function validateRecordHosting<V>(v: V) {
+  return validate<RecordHosting & V>(v, id, hashRecordHosting)
+}
+
+export function isValidRecordHosting<V>(v: V) {
+  return isValid<RecordHosting>(v, id, hashRecordHosting)
 }
diff --git a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
index 77db148d612..02e7369f9ca 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
@@ -4,43 +4,48 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.emitEvent'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   event:
-    | ToolsOzoneModerationDefs.ModEventTakedown
-    | ToolsOzoneModerationDefs.ModEventAcknowledge
-    | ToolsOzoneModerationDefs.ModEventEscalate
-    | ToolsOzoneModerationDefs.ModEventComment
-    | ToolsOzoneModerationDefs.ModEventLabel
-    | ToolsOzoneModerationDefs.ModEventReport
-    | ToolsOzoneModerationDefs.ModEventMute
-    | ToolsOzoneModerationDefs.ModEventUnmute
-    | ToolsOzoneModerationDefs.ModEventMuteReporter
-    | ToolsOzoneModerationDefs.ModEventUnmuteReporter
-    | ToolsOzoneModerationDefs.ModEventReverseTakedown
-    | ToolsOzoneModerationDefs.ModEventResolveAppeal
-    | ToolsOzoneModerationDefs.ModEventEmail
-    | ToolsOzoneModerationDefs.ModEventTag
-    | ToolsOzoneModerationDefs.AccountEvent
-    | ToolsOzoneModerationDefs.IdentityEvent
-    | ToolsOzoneModerationDefs.RecordEvent
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.ModEventTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventAcknowledge>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEscalate>
+    | $Typed<ToolsOzoneModerationDefs.ModEventComment>
+    | $Typed<ToolsOzoneModerationDefs.ModEventLabel>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReport>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEmail>
+    | $Typed<ToolsOzoneModerationDefs.ModEventTag>
+    | $Typed<ToolsOzoneModerationDefs.AccountEvent>
+    | $Typed<ToolsOzoneModerationDefs.IdentityEvent>
+    | $Typed<ToolsOzoneModerationDefs.RecordEvent>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   subjectBlobCids?: string[]
   createdBy: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneModerationDefs.ModEventView
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts b/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
index 784e2265a7b..799f0ac0a69 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneModerationDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getEvent'
 
 export interface QueryParams {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts b/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
index 7766b4ed36f..33c62e14e07 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneModerationDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRecord'
 
 export interface QueryParams {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts b/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
index 524933a1c71..b05086b79fe 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneModerationDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRecords'
 
 export interface QueryParams {
@@ -18,11 +24,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   records: (
-    | ToolsOzoneModerationDefs.RecordViewDetail
-    | ToolsOzoneModerationDefs.RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RecordViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RecordViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts b/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
index 61c3398c19a..5b414b62abb 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneModerationDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRepo'
 
 export interface QueryParams {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts b/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
index bb761bc2cfb..3656386727e 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneModerationDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRepos'
 
 export interface QueryParams {
@@ -18,11 +24,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   repos: (
-    | ToolsOzoneModerationDefs.RepoViewDetail
-    | ToolsOzoneModerationDefs.RepoViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RepoViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RepoViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts b/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
index 9a0f7d0555c..034c50e7559 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneModerationDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.queryEvents'
 
 export interface QueryParams {
@@ -49,7 +55,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   events: ToolsOzoneModerationDefs.ModEventView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
index bb912f1f905..e68fcc9ade6 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneModerationDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.queryStatuses'
 
 export interface QueryParams {
@@ -65,7 +71,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   subjectStatuses: ToolsOzoneModerationDefs.SubjectStatusView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts b/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
index 9205ee67939..9d3565704b2 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneModerationDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.searchRepos'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: ToolsOzoneModerationDefs.RepoView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/server/getConfig.ts b/packages/api/src/client/types/tools/ozone/server/getConfig.ts
index 6d9d4130c7f..98860bf9b4f 100644
--- a/packages/api/src/client/types/tools/ozone/server/getConfig.ts
+++ b/packages/api/src/client/types/tools/ozone/server/getConfig.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.server.getConfig'
 
 export interface QueryParams {}
@@ -19,7 +25,6 @@ export interface OutputSchema {
   blobDivert?: ServiceConfig
   chat?: ServiceConfig
   viewer?: ViewerConfig
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -38,45 +43,43 @@ export function toKnownErr(e: any) {
 }
 
 export interface ServiceConfig {
+  $type?: $Type<'tools.ozone.server.getConfig', 'serviceConfig'>
   url?: string
-  [k: string]: unknown
 }
 
-export function isServiceConfig(
-  v: unknown,
-): v is ServiceConfig & {
-  $type: $Type<'tools.ozone.server.getConfig', 'serviceConfig'>
-} {
-  return is$typed(v, id, 'serviceConfig')
+const hashServiceConfig = 'serviceConfig'
+
+export function isServiceConfig<V>(v: V) {
+  return is$typed(v, id, hashServiceConfig)
+}
+
+export function validateServiceConfig<V>(v: V) {
+  return validate<ServiceConfig & V>(v, id, hashServiceConfig)
 }
 
-export function validateServiceConfig(v: unknown) {
-  return lexicons.validate(
-    `${id}#serviceConfig`,
-    v,
-  ) as ValidationResult<ServiceConfig>
+export function isValidServiceConfig<V>(v: V) {
+  return isValid<ServiceConfig>(v, id, hashServiceConfig)
 }
 
 export interface ViewerConfig {
+  $type?: $Type<'tools.ozone.server.getConfig', 'viewerConfig'>
   role?:
     | 'tools.ozone.team.defs#roleAdmin'
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isViewerConfig(
-  v: unknown,
-): v is ViewerConfig & {
-  $type: $Type<'tools.ozone.server.getConfig', 'viewerConfig'>
-} {
-  return is$typed(v, id, 'viewerConfig')
+const hashViewerConfig = 'viewerConfig'
+
+export function isViewerConfig<V>(v: V) {
+  return is$typed(v, id, hashViewerConfig)
+}
+
+export function validateViewerConfig<V>(v: V) {
+  return validate<ViewerConfig & V>(v, id, hashViewerConfig)
 }
 
-export function validateViewerConfig(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerConfig`,
-    v,
-  ) as ValidationResult<ViewerConfig>
+export function isValidViewerConfig<V>(v: V) {
+  return isValid<ViewerConfig>(v, id, hashViewerConfig)
 }
diff --git a/packages/api/src/client/types/tools/ozone/set/addValues.ts b/packages/api/src/client/types/tools/ozone/set/addValues.ts
index b628282aeb9..7d0cc420b1e 100644
--- a/packages/api/src/client/types/tools/ozone/set/addValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/addValues.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.addValues'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to add to the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/set/defs.ts b/packages/api/src/client/types/tools/ozone/set/defs.ts
index b8449307784..7353057bbef 100644
--- a/packages/api/src/client/types/tools/ozone/set/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/set/defs.ts
@@ -3,42 +3,56 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.defs'
 
 export interface Set {
+  $type?: $Type<'tools.ozone.set.defs', 'set'>
   name: string
   description?: string
-  [k: string]: unknown
 }
 
-export function isSet(
-  v: unknown,
-): v is Set & { $type: $Type<'tools.ozone.set.defs', 'set'> } {
-  return is$typed(v, id, 'set')
+const hashSet = 'set'
+
+export function isSet<V>(v: V) {
+  return is$typed(v, id, hashSet)
+}
+
+export function validateSet<V>(v: V) {
+  return validate<Set & V>(v, id, hashSet)
 }
 
-export function validateSet(v: unknown) {
-  return lexicons.validate(`${id}#set`, v) as ValidationResult<Set>
+export function isValidSet<V>(v: V) {
+  return isValid<Set>(v, id, hashSet)
 }
 
 export interface SetView {
+  $type?: $Type<'tools.ozone.set.defs', 'setView'>
   name: string
   description?: string
   setSize: number
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isSetView(
-  v: unknown,
-): v is SetView & { $type: $Type<'tools.ozone.set.defs', 'setView'> } {
-  return is$typed(v, id, 'setView')
+const hashSetView = 'setView'
+
+export function isSetView<V>(v: V) {
+  return is$typed(v, id, hashSetView)
+}
+
+export function validateSetView<V>(v: V) {
+  return validate<SetView & V>(v, id, hashSetView)
 }
 
-export function validateSetView(v: unknown) {
-  return lexicons.validate(`${id}#setView`, v) as ValidationResult<SetView>
+export function isValidSetView<V>(v: V) {
+  return isValid<SetView>(v, id, hashSetView)
 }
diff --git a/packages/api/src/client/types/tools/ozone/set/deleteSet.ts b/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
index 2722cfee543..508d3e6d5c1 100644
--- a/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
+++ b/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.deleteSet'
 
 export interface QueryParams {}
@@ -14,12 +20,9 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Name of the set to delete */
   name: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface CallOptions {
   signal?: AbortSignal
diff --git a/packages/api/src/client/types/tools/ozone/set/deleteValues.ts b/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
index 901ab2b219a..959b6bf8859 100644
--- a/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.deleteValues'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to delete from the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/set/getValues.ts b/packages/api/src/client/types/tools/ozone/set/getValues.ts
index dca9c73fdd0..912800f8726 100644
--- a/packages/api/src/client/types/tools/ozone/set/getValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/getValues.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneSetDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSetDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.getValues'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export interface OutputSchema {
   set: ToolsOzoneSetDefs.SetView
   values: string[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/set/querySets.ts b/packages/api/src/client/types/tools/ozone/set/querySets.ts
index 723fa2e650b..f18b469384f 100644
--- a/packages/api/src/client/types/tools/ozone/set/querySets.ts
+++ b/packages/api/src/client/types/tools/ozone/set/querySets.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneSetDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSetDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.querySets'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   sets: ToolsOzoneSetDefs.SetView[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/set/upsertSet.ts b/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
index 024cd4b62bb..5e2b547ac83 100644
--- a/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
+++ b/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneSetDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSetDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.upsertSet'
 
 export interface QueryParams {}
diff --git a/packages/api/src/client/types/tools/ozone/setting/defs.ts b/packages/api/src/client/types/tools/ozone/setting/defs.ts
index 192915fe56d..380567ec66e 100644
--- a/packages/api/src/client/types/tools/ozone/setting/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/defs.ts
@@ -3,15 +3,22 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.defs'
 
 export interface Option {
+  $type?: $Type<'tools.ozone.setting.defs', 'option'>
   key: string
   did: string
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   createdAt?: string
   updatedAt?: string
@@ -23,15 +30,18 @@ export interface Option {
   scope: 'instance' | 'personal' | (string & {})
   createdBy: string
   lastUpdatedBy: string
-  [k: string]: unknown
 }
 
-export function isOption(
-  v: unknown,
-): v is Option & { $type: $Type<'tools.ozone.setting.defs', 'option'> } {
-  return is$typed(v, id, 'option')
+const hashOption = 'option'
+
+export function isOption<V>(v: V) {
+  return is$typed(v, id, hashOption)
+}
+
+export function validateOption<V>(v: V) {
+  return validate<Option & V>(v, id, hashOption)
 }
 
-export function validateOption(v: unknown) {
-  return lexicons.validate(`${id}#option`, v) as ValidationResult<Option>
+export function isValidOption<V>(v: V) {
+  return isValid<Option>(v, id, hashOption)
 }
diff --git a/packages/api/src/client/types/tools/ozone/setting/listOptions.ts b/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
index 6b12b210cf3..80240d85f17 100644
--- a/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneSettingDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSettingDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.listOptions'
 
 export interface QueryParams {
@@ -25,7 +31,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   options: ToolsOzoneSettingDefs.Option[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts b/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
index 7a351b52be9..2564301847c 100644
--- a/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
@@ -4,9 +4,15 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.removeOptions'
 
 export interface QueryParams {}
@@ -14,12 +20,9 @@ export interface QueryParams {}
 export interface InputSchema {
   keys: string[]
   scope: 'instance' | 'personal' | (string & {})
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface CallOptions {
   signal?: AbortSignal
diff --git a/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts b/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
index 1b25cc316be..5fe05f45c3d 100644
--- a/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneSettingDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSettingDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.upsertOption'
 
 export interface QueryParams {}
@@ -15,19 +21,17 @@ export interface QueryParams {}
 export interface InputSchema {
   key: string
   scope: 'instance' | 'personal' | (string & {})
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   managerRole?:
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | 'tools.ozone.team.defs#roleAdmin'
     | (string & {})
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   option: ToolsOzoneSettingDefs.Option
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/signature/defs.ts b/packages/api/src/client/types/tools/ozone/signature/defs.ts
index 446ef647eff..361ed968924 100644
--- a/packages/api/src/client/types/tools/ozone/signature/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/defs.ts
@@ -3,25 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
+  $type?: $Type<'tools.ozone.signature.defs', 'sigDetail'>
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isSigDetail(
-  v: unknown,
-): v is SigDetail & {
-  $type: $Type<'tools.ozone.signature.defs', 'sigDetail'>
-} {
-  return is$typed(v, id, 'sigDetail')
+const hashSigDetail = 'sigDetail'
+
+export function isSigDetail<V>(v: V) {
+  return is$typed(v, id, hashSigDetail)
+}
+
+export function validateSigDetail<V>(v: V) {
+  return validate<SigDetail & V>(v, id, hashSigDetail)
 }
 
-export function validateSigDetail(v: unknown) {
-  return lexicons.validate(`${id}#sigDetail`, v) as ValidationResult<SigDetail>
+export function isValidSigDetail<V>(v: V) {
+  return isValid<SigDetail>(v, id, hashSigDetail)
 }
diff --git a/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts b/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
index 079b7ee2e86..ab10400e319 100644
--- a/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneSignatureDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSignatureDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.findCorrelation'
 
 export interface QueryParams {
@@ -18,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   details: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
index 1a88aecd95c..cffdd0d558c 100644
--- a/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -4,11 +4,17 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ToolsOzoneSignatureDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ToolsOzoneSignatureDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.findRelatedAccounts'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: RelatedAccount[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -41,22 +46,21 @@ export function toKnownErr(e: any) {
 }
 
 export interface RelatedAccount {
+  $type?: $Type<'tools.ozone.signature.findRelatedAccounts', 'relatedAccount'>
   account: ComAtprotoAdminDefs.AccountView
   similarities?: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
-export function isRelatedAccount(
-  v: unknown,
-): v is RelatedAccount & {
-  $type: $Type<'tools.ozone.signature.findRelatedAccounts', 'relatedAccount'>
-} {
-  return is$typed(v, id, 'relatedAccount')
+const hashRelatedAccount = 'relatedAccount'
+
+export function isRelatedAccount<V>(v: V) {
+  return is$typed(v, id, hashRelatedAccount)
+}
+
+export function validateRelatedAccount<V>(v: V) {
+  return validate<RelatedAccount & V>(v, id, hashRelatedAccount)
 }
 
-export function validateRelatedAccount(v: unknown) {
-  return lexicons.validate(
-    `${id}#relatedAccount`,
-    v,
-  ) as ValidationResult<RelatedAccount>
+export function isValidRelatedAccount<V>(v: V) {
+  return isValid<RelatedAccount>(v, id, hashRelatedAccount)
 }
diff --git a/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts b/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
index 6e7dd5231c3..26a7bcbb2df 100644
--- a/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.searchAccounts'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/team/addMember.ts b/packages/api/src/client/types/tools/ozone/team/addMember.ts
index 86ab1a33e5d..61eacf30369 100644
--- a/packages/api/src/client/types/tools/ozone/team/addMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/addMember.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneTeamDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneTeamDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.addMember'
 
 export interface QueryParams {}
@@ -19,7 +25,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/api/src/client/types/tools/ozone/team/defs.ts b/packages/api/src/client/types/tools/ozone/team/defs.ts
index 77f7692fca2..3a56797e596 100644
--- a/packages/api/src/client/types/tools/ozone/team/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/team/defs.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.defs'
 
 export interface Member {
+  $type?: $Type<'tools.ozone.team.defs', 'member'>
   did: string
   disabled?: boolean
   profile?: AppBskyActorDefs.ProfileViewDetailed
@@ -21,17 +28,20 @@ export interface Member {
     | 'lex:tools.ozone.team.defs#roleModerator'
     | 'lex:tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isMember(
-  v: unknown,
-): v is Member & { $type: $Type<'tools.ozone.team.defs', 'member'> } {
-  return is$typed(v, id, 'member')
+const hashMember = 'member'
+
+export function isMember<V>(v: V) {
+  return is$typed(v, id, hashMember)
+}
+
+export function validateMember<V>(v: V) {
+  return validate<Member & V>(v, id, hashMember)
 }
 
-export function validateMember(v: unknown) {
-  return lexicons.validate(`${id}#member`, v) as ValidationResult<Member>
+export function isValidMember<V>(v: V) {
+  return isValid<Member>(v, id, hashMember)
 }
 
 /** Admin role. Highest level of access, can perform all actions. */
diff --git a/packages/api/src/client/types/tools/ozone/team/deleteMember.ts b/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
index f8440f294e4..6ac35b07fdd 100644
--- a/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
@@ -4,16 +4,21 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.deleteMember'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/team/listMembers.ts b/packages/api/src/client/types/tools/ozone/team/listMembers.ts
index 3b3a7e94c30..0ace891bc0e 100644
--- a/packages/api/src/client/types/tools/ozone/team/listMembers.ts
+++ b/packages/api/src/client/types/tools/ozone/team/listMembers.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneTeamDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneTeamDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   members: ToolsOzoneTeamDefs.Member[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/team/updateMember.ts b/packages/api/src/client/types/tools/ozone/team/updateMember.ts
index 43ce530e696..087250fea0f 100644
--- a/packages/api/src/client/types/tools/ozone/team/updateMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/updateMember.ts
@@ -4,10 +4,16 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { $Type, is$typed } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
-import * as ToolsOzoneTeamDefs from './defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneTeamDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.updateMember'
 
 export interface QueryParams {}
@@ -20,7 +26,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/api/src/client/util.ts b/packages/api/src/client/util.ts
index a8b8cc9e0b7..2d83b0960f1 100644
--- a/packages/api/src/client/util.ts
+++ b/packages/api/src/client/util.ts
@@ -1,39 +1,62 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
+export type OmitKey<T, K extends keyof T> = {
+  [K2 in keyof T as K2 extends K ? never : K2]: T[K2]
+}
+
 export type $Typed<V> = V & { $type: string }
 
 export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
   ? Id | `${Id}#${Hash}`
   : `${Id}#${Hash}`
 
-function has$type<V>(v: V): v is $Typed<V & object> {
-  return (
-    v != null &&
-    typeof v === 'object' &&
-    '$type' in v &&
-    typeof v.$type === 'string'
-  )
+function isObject<V>(v: V): v is V & object {
+  return v != null && typeof v === 'object'
 }
 
 function check$type<Id extends string, Hash extends string>(
-  $type: string,
+  $type: unknown,
   id: Id,
   hash: Hash,
 ): $type is $Type<Id, Hash> {
   return $type === id
     ? hash === 'main'
     : // $type === `${id}#${hash}`
-      $type.length === id.length + 1 + hash.length &&
+      typeof $type === 'string' &&
+        $type.length === id.length + 1 + hash.length &&
         $type.charCodeAt(id.length) === 35 /* '#' */ &&
         $type.startsWith(id) &&
         $type.endsWith(hash)
 }
 
+export type Is$Typed<V, Id extends string, Hash extends string> = V extends {
+  $type: $Type<Id, Hash>
+}
+  ? V
+  : V extends { $type?: string }
+    ? V extends { $type?: $Type<Id, Hash> }
+      ? $Typed<V>
+      : never
+    : V & { $type: $Type<Id, Hash> }
+
 export function is$typed<V, Id extends string, Hash extends string>(
   v: V,
   id: Id,
   hash: Hash,
-): v is V & object & { $type: $Type<Id, Hash> } {
-  return has$type(v) && check$type(v.$type, id, hash)
+): v is Is$Typed<V, Id, Hash> {
+  return isObject(v) && '$type' in v && check$type(v.$type, id, hash)
+}
+
+export function maybe$typed<V, Id extends string, Hash extends string>(
+  v: V,
+  id: Id,
+  hash: Hash,
+): v is V & object & { $type?: $Type<Id, Hash> } {
+  return (
+    isObject(v) &&
+    ('$type' in v
+      ? v.$type === undefined || check$type(v.$type, id, hash)
+      : true)
+  )
 }
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index c24ef7394f2..bd6e5cb6f86 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -1,7 +1,13 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { LexiconDoc, Lexicons } from '@atproto/lexicon'
+import {
+  LexiconDoc,
+  Lexicons,
+  ValidationError,
+  ValidationResult,
+} from '@atproto/lexicon'
+import { $Typed, is$typed, maybe$typed } from './util'
 
 export const schemaDict = {
   ComAtprotoAdminDefs: {
@@ -10809,6 +10815,44 @@ export const schemaDict = {
 
 export const schemas = Object.values(schemaDict)
 export const lexicons: Lexicons = new Lexicons(schemas)
+
+export function validate<V>(v: unknown, id: string, hash: string) {
+  return (
+    maybe$typed(v, id, hash)
+      ? lexicons.validate(`${id}#${hash}`, v)
+      : {
+          success: false,
+          error: new ValidationError(
+            `Must be an object with "${id}#${hash}" $type property`,
+          ),
+        }
+  ) as ValidationResult<V>
+}
+
+export function isValid<V extends { $type?: string }>(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType: true,
+): v is $Typed<V>
+export function isValid<V extends { $type?: string }>(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType?: boolean,
+): v is V
+export function isValid(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType?: boolean,
+) {
+  return (
+    (requiredType ? is$typed : maybe$typed)(v, id, hash) &&
+    validate(v, id, hash).success
+  )
+}
+
 export const ids = {
   ComAtprotoAdminDefs: 'com.atproto.admin.defs',
   ComAtprotoAdminDeleteAccount: 'com.atproto.admin.deleteAccount',
@@ -11018,4 +11062,4 @@ export const ids = {
   ChatBskyModerationGetActorMetadata: 'chat.bsky.moderation.getActorMetadata',
   ChatBskyModerationGetMessageContext: 'chat.bsky.moderation.getMessageContext',
   ChatBskyModerationUpdateActorAccess: 'chat.bsky.moderation.updateActorAccess',
-}
+} as const
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
index 92c6cd53d28..5e42bd080d5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
@@ -3,15 +3,22 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyGraphDefs from '../graph/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
   did: string
   handle: string
   displayName?: string
@@ -20,25 +27,24 @@ export interface ProfileViewBasic {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   createdAt?: string
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(
-  v: unknown,
-): v is ProfileViewBasic & {
-  $type: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
-} {
-  return is$typed(v, id, 'profileViewBasic')
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewBasic`,
-    v,
-  ) as ValidationResult<ProfileViewBasic>
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
+}
+
+export function isValidProfileViewBasic<V>(v: V) {
+  return isValid<ProfileViewBasic>(v, id, hashProfileViewBasic)
 }
 
 export interface ProfileView {
+  $type?: $Type<'app.bsky.actor.defs', 'profileView'>
   did: string
   handle: string
   displayName?: string
@@ -49,23 +55,24 @@ export interface ProfileView {
   createdAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isProfileView(
-  v: unknown,
-): v is ProfileView & { $type: $Type<'app.bsky.actor.defs', 'profileView'> } {
-  return is$typed(v, id, 'profileView')
+const hashProfileView = 'profileView'
+
+export function isProfileView<V>(v: V) {
+  return is$typed(v, id, hashProfileView)
+}
+
+export function validateProfileView<V>(v: V) {
+  return validate<ProfileView & V>(v, id, hashProfileView)
 }
 
-export function validateProfileView(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileView`,
-    v,
-  ) as ValidationResult<ProfileView>
+export function isValidProfileView<V>(v: V) {
+  return isValid<ProfileView>(v, id, hashProfileView)
 }
 
 export interface ProfileViewDetailed {
+  $type?: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
   did: string
   handle: string
   displayName?: string
@@ -82,70 +89,67 @@ export interface ProfileViewDetailed {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   pinnedPost?: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isProfileViewDetailed(
-  v: unknown,
-): v is ProfileViewDetailed & {
-  $type: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
-} {
-  return is$typed(v, id, 'profileViewDetailed')
+const hashProfileViewDetailed = 'profileViewDetailed'
+
+export function isProfileViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashProfileViewDetailed)
+}
+
+export function validateProfileViewDetailed<V>(v: V) {
+  return validate<ProfileViewDetailed & V>(v, id, hashProfileViewDetailed)
 }
 
-export function validateProfileViewDetailed(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewDetailed`,
-    v,
-  ) as ValidationResult<ProfileViewDetailed>
+export function isValidProfileViewDetailed<V>(v: V) {
+  return isValid<ProfileViewDetailed>(v, id, hashProfileViewDetailed)
 }
 
 export interface ProfileAssociated {
+  $type?: $Type<'app.bsky.actor.defs', 'profileAssociated'>
   lists?: number
   feedgens?: number
   starterPacks?: number
   labeler?: boolean
   chat?: ProfileAssociatedChat
-  [k: string]: unknown
 }
 
-export function isProfileAssociated(
-  v: unknown,
-): v is ProfileAssociated & {
-  $type: $Type<'app.bsky.actor.defs', 'profileAssociated'>
-} {
-  return is$typed(v, id, 'profileAssociated')
+const hashProfileAssociated = 'profileAssociated'
+
+export function isProfileAssociated<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociated)
+}
+
+export function validateProfileAssociated<V>(v: V) {
+  return validate<ProfileAssociated & V>(v, id, hashProfileAssociated)
 }
 
-export function validateProfileAssociated(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileAssociated`,
-    v,
-  ) as ValidationResult<ProfileAssociated>
+export function isValidProfileAssociated<V>(v: V) {
+  return isValid<ProfileAssociated>(v, id, hashProfileAssociated)
 }
 
 export interface ProfileAssociatedChat {
+  $type?: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
-  [k: string]: unknown
 }
 
-export function isProfileAssociatedChat(
-  v: unknown,
-): v is ProfileAssociatedChat & {
-  $type: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
-} {
-  return is$typed(v, id, 'profileAssociatedChat')
+const hashProfileAssociatedChat = 'profileAssociatedChat'
+
+export function isProfileAssociatedChat<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociatedChat)
 }
 
-export function validateProfileAssociatedChat(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileAssociatedChat`,
-    v,
-  ) as ValidationResult<ProfileAssociatedChat>
+export function validateProfileAssociatedChat<V>(v: V) {
+  return validate<ProfileAssociatedChat & V>(v, id, hashProfileAssociatedChat)
+}
+
+export function isValidProfileAssociatedChat<V>(v: V) {
+  return isValid<ProfileAssociatedChat>(v, id, hashProfileAssociatedChat)
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: $Type<'app.bsky.actor.defs', 'viewerState'>
   muted?: boolean
   mutedByList?: AppBskyGraphDefs.ListViewBasic
   blockedBy?: boolean
@@ -154,185 +158,184 @@ export interface ViewerState {
   following?: string
   followedBy?: string
   knownFollowers?: KnownFollowers
-  [k: string]: unknown
 }
 
-export function isViewerState(
-  v: unknown,
-): v is ViewerState & { $type: $Type<'app.bsky.actor.defs', 'viewerState'> } {
-  return is$typed(v, id, 'viewerState')
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
+}
+
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerState`,
-    v,
-  ) as ValidationResult<ViewerState>
+export function isValidViewerState<V>(v: V) {
+  return isValid<ViewerState>(v, id, hashViewerState)
 }
 
 /** The subject's followers whom you also follow */
 export interface KnownFollowers {
+  $type?: $Type<'app.bsky.actor.defs', 'knownFollowers'>
   count: number
   followers: ProfileViewBasic[]
-  [k: string]: unknown
 }
 
-export function isKnownFollowers(
-  v: unknown,
-): v is KnownFollowers & {
-  $type: $Type<'app.bsky.actor.defs', 'knownFollowers'>
-} {
-  return is$typed(v, id, 'knownFollowers')
+const hashKnownFollowers = 'knownFollowers'
+
+export function isKnownFollowers<V>(v: V) {
+  return is$typed(v, id, hashKnownFollowers)
+}
+
+export function validateKnownFollowers<V>(v: V) {
+  return validate<KnownFollowers & V>(v, id, hashKnownFollowers)
 }
 
-export function validateKnownFollowers(v: unknown) {
-  return lexicons.validate(
-    `${id}#knownFollowers`,
-    v,
-  ) as ValidationResult<KnownFollowers>
+export function isValidKnownFollowers<V>(v: V) {
+  return isValid<KnownFollowers>(v, id, hashKnownFollowers)
 }
 
 export type Preferences = (
-  | AdultContentPref
-  | ContentLabelPref
-  | SavedFeedsPref
-  | SavedFeedsPrefV2
-  | PersonalDetailsPref
-  | FeedViewPref
-  | ThreadViewPref
-  | InterestsPref
-  | MutedWordsPref
-  | HiddenPostsPref
-  | BskyAppStatePref
-  | LabelersPref
-  | { $type: string; [k: string]: unknown }
+  | $Typed<AdultContentPref>
+  | $Typed<ContentLabelPref>
+  | $Typed<SavedFeedsPref>
+  | $Typed<SavedFeedsPrefV2>
+  | $Typed<PersonalDetailsPref>
+  | $Typed<FeedViewPref>
+  | $Typed<ThreadViewPref>
+  | $Typed<InterestsPref>
+  | $Typed<MutedWordsPref>
+  | $Typed<HiddenPostsPref>
+  | $Typed<BskyAppStatePref>
+  | $Typed<LabelersPref>
+  | { $type: string }
 )[]
 
 export interface AdultContentPref {
+  $type?: $Type<'app.bsky.actor.defs', 'adultContentPref'>
   enabled: boolean
-  [k: string]: unknown
 }
 
-export function isAdultContentPref(
-  v: unknown,
-): v is AdultContentPref & {
-  $type: $Type<'app.bsky.actor.defs', 'adultContentPref'>
-} {
-  return is$typed(v, id, 'adultContentPref')
+const hashAdultContentPref = 'adultContentPref'
+
+export function isAdultContentPref<V>(v: V) {
+  return is$typed(v, id, hashAdultContentPref)
 }
 
-export function validateAdultContentPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#adultContentPref`,
-    v,
-  ) as ValidationResult<AdultContentPref>
+export function validateAdultContentPref<V>(v: V) {
+  return validate<AdultContentPref & V>(v, id, hashAdultContentPref)
+}
+
+export function isValidAdultContentPref<V>(v: V) {
+  return isValid<AdultContentPref>(v, id, hashAdultContentPref)
 }
 
 export interface ContentLabelPref {
+  $type?: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
   /** Which labeler does this preference apply to? If undefined, applies globally. */
   labelerDid?: string
   label: string
   visibility: 'ignore' | 'show' | 'warn' | 'hide' | (string & {})
-  [k: string]: unknown
 }
 
-export function isContentLabelPref(
-  v: unknown,
-): v is ContentLabelPref & {
-  $type: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
-} {
-  return is$typed(v, id, 'contentLabelPref')
+const hashContentLabelPref = 'contentLabelPref'
+
+export function isContentLabelPref<V>(v: V) {
+  return is$typed(v, id, hashContentLabelPref)
+}
+
+export function validateContentLabelPref<V>(v: V) {
+  return validate<ContentLabelPref & V>(v, id, hashContentLabelPref)
 }
 
-export function validateContentLabelPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#contentLabelPref`,
-    v,
-  ) as ValidationResult<ContentLabelPref>
+export function isValidContentLabelPref<V>(v: V) {
+  return isValid<ContentLabelPref>(v, id, hashContentLabelPref)
 }
 
 export interface SavedFeed {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeed'>
   id: string
   type: 'feed' | 'list' | 'timeline' | (string & {})
   value: string
   pinned: boolean
-  [k: string]: unknown
 }
 
-export function isSavedFeed(
-  v: unknown,
-): v is SavedFeed & { $type: $Type<'app.bsky.actor.defs', 'savedFeed'> } {
-  return is$typed(v, id, 'savedFeed')
+const hashSavedFeed = 'savedFeed'
+
+export function isSavedFeed<V>(v: V) {
+  return is$typed(v, id, hashSavedFeed)
+}
+
+export function validateSavedFeed<V>(v: V) {
+  return validate<SavedFeed & V>(v, id, hashSavedFeed)
 }
 
-export function validateSavedFeed(v: unknown) {
-  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
+export function isValidSavedFeed<V>(v: V) {
+  return isValid<SavedFeed>(v, id, hashSavedFeed)
 }
 
 export interface SavedFeedsPrefV2 {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
   items: SavedFeed[]
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(
-  v: unknown,
-): v is SavedFeedsPrefV2 & {
-  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
-} {
-  return is$typed(v, id, 'savedFeedsPrefV2')
+const hashSavedFeedsPrefV2 = 'savedFeedsPrefV2'
+
+export function isSavedFeedsPrefV2<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPrefV2)
 }
 
-export function validateSavedFeedsPrefV2(v: unknown) {
-  return lexicons.validate(
-    `${id}#savedFeedsPrefV2`,
-    v,
-  ) as ValidationResult<SavedFeedsPrefV2>
+export function validateSavedFeedsPrefV2<V>(v: V) {
+  return validate<SavedFeedsPrefV2 & V>(v, id, hashSavedFeedsPrefV2)
+}
+
+export function isValidSavedFeedsPrefV2<V>(v: V) {
+  return isValid<SavedFeedsPrefV2>(v, id, hashSavedFeedsPrefV2)
 }
 
 export interface SavedFeedsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
   pinned: string[]
   saved: string[]
   timelineIndex?: number
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPref(
-  v: unknown,
-): v is SavedFeedsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
-} {
-  return is$typed(v, id, 'savedFeedsPref')
+const hashSavedFeedsPref = 'savedFeedsPref'
+
+export function isSavedFeedsPref<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPref)
+}
+
+export function validateSavedFeedsPref<V>(v: V) {
+  return validate<SavedFeedsPref & V>(v, id, hashSavedFeedsPref)
 }
 
-export function validateSavedFeedsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#savedFeedsPref`,
-    v,
-  ) as ValidationResult<SavedFeedsPref>
+export function isValidSavedFeedsPref<V>(v: V) {
+  return isValid<SavedFeedsPref>(v, id, hashSavedFeedsPref)
 }
 
 export interface PersonalDetailsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
   /** The birth date of account owner. */
   birthDate?: string
-  [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(
-  v: unknown,
-): v is PersonalDetailsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
-} {
-  return is$typed(v, id, 'personalDetailsPref')
+const hashPersonalDetailsPref = 'personalDetailsPref'
+
+export function isPersonalDetailsPref<V>(v: V) {
+  return is$typed(v, id, hashPersonalDetailsPref)
+}
+
+export function validatePersonalDetailsPref<V>(v: V) {
+  return validate<PersonalDetailsPref & V>(v, id, hashPersonalDetailsPref)
 }
 
-export function validatePersonalDetailsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#personalDetailsPref`,
-    v,
-  ) as ValidationResult<PersonalDetailsPref>
+export function isValidPersonalDetailsPref<V>(v: V) {
+  return isValid<PersonalDetailsPref>(v, id, hashPersonalDetailsPref)
 }
 
 export interface FeedViewPref {
+  $type?: $Type<'app.bsky.actor.defs', 'feedViewPref'>
   /** The URI of the feed, or an identifier which describes the feed. */
   feed: string
   /** Hide replies in the feed. */
@@ -345,23 +348,24 @@ export interface FeedViewPref {
   hideReposts?: boolean
   /** Hide quote posts in the feed. */
   hideQuotePosts?: boolean
-  [k: string]: unknown
 }
 
-export function isFeedViewPref(
-  v: unknown,
-): v is FeedViewPref & { $type: $Type<'app.bsky.actor.defs', 'feedViewPref'> } {
-  return is$typed(v, id, 'feedViewPref')
+const hashFeedViewPref = 'feedViewPref'
+
+export function isFeedViewPref<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPref)
 }
 
-export function validateFeedViewPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#feedViewPref`,
-    v,
-  ) as ValidationResult<FeedViewPref>
+export function validateFeedViewPref<V>(v: V) {
+  return validate<FeedViewPref & V>(v, id, hashFeedViewPref)
+}
+
+export function isValidFeedViewPref<V>(v: V) {
+  return isValid<FeedViewPref>(v, id, hashFeedViewPref)
 }
 
 export interface ThreadViewPref {
+  $type?: $Type<'app.bsky.actor.defs', 'threadViewPref'>
   /** Sorting mode for threads. */
   sort?:
     | 'oldest'
@@ -372,49 +376,47 @@ export interface ThreadViewPref {
     | (string & {})
   /** Show followed users at the top of all replies. */
   prioritizeFollowedUsers?: boolean
-  [k: string]: unknown
 }
 
-export function isThreadViewPref(
-  v: unknown,
-): v is ThreadViewPref & {
-  $type: $Type<'app.bsky.actor.defs', 'threadViewPref'>
-} {
-  return is$typed(v, id, 'threadViewPref')
+const hashThreadViewPref = 'threadViewPref'
+
+export function isThreadViewPref<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPref)
+}
+
+export function validateThreadViewPref<V>(v: V) {
+  return validate<ThreadViewPref & V>(v, id, hashThreadViewPref)
 }
 
-export function validateThreadViewPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadViewPref`,
-    v,
-  ) as ValidationResult<ThreadViewPref>
+export function isValidThreadViewPref<V>(v: V) {
+  return isValid<ThreadViewPref>(v, id, hashThreadViewPref)
 }
 
 export interface InterestsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'interestsPref'>
   /** A list of tags which describe the account owner's interests gathered during onboarding. */
   tags: string[]
-  [k: string]: unknown
 }
 
-export function isInterestsPref(
-  v: unknown,
-): v is InterestsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'interestsPref'>
-} {
-  return is$typed(v, id, 'interestsPref')
+const hashInterestsPref = 'interestsPref'
+
+export function isInterestsPref<V>(v: V) {
+  return is$typed(v, id, hashInterestsPref)
+}
+
+export function validateInterestsPref<V>(v: V) {
+  return validate<InterestsPref & V>(v, id, hashInterestsPref)
 }
 
-export function validateInterestsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#interestsPref`,
-    v,
-  ) as ValidationResult<InterestsPref>
+export function isValidInterestsPref<V>(v: V) {
+  return isValid<InterestsPref>(v, id, hashInterestsPref)
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
 
 /** A word that the account owner has muted. */
 export interface MutedWord {
+  $type?: $Type<'app.bsky.actor.defs', 'mutedWord'>
   id?: string
   /** The muted word itself. */
   value: string
@@ -424,162 +426,165 @@ export interface MutedWord {
   actorTarget: 'all' | 'exclude-following' | (string & {})
   /** The date and time at which the muted word will expire and no longer be applied. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isMutedWord(
-  v: unknown,
-): v is MutedWord & { $type: $Type<'app.bsky.actor.defs', 'mutedWord'> } {
-  return is$typed(v, id, 'mutedWord')
+const hashMutedWord = 'mutedWord'
+
+export function isMutedWord<V>(v: V) {
+  return is$typed(v, id, hashMutedWord)
 }
 
-export function validateMutedWord(v: unknown) {
-  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
+export function validateMutedWord<V>(v: V) {
+  return validate<MutedWord & V>(v, id, hashMutedWord)
+}
+
+export function isValidMutedWord<V>(v: V) {
+  return isValid<MutedWord>(v, id, hashMutedWord)
 }
 
 export interface MutedWordsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
   /** A list of words the account owner has muted. */
   items: MutedWord[]
-  [k: string]: unknown
 }
 
-export function isMutedWordsPref(
-  v: unknown,
-): v is MutedWordsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
-} {
-  return is$typed(v, id, 'mutedWordsPref')
+const hashMutedWordsPref = 'mutedWordsPref'
+
+export function isMutedWordsPref<V>(v: V) {
+  return is$typed(v, id, hashMutedWordsPref)
+}
+
+export function validateMutedWordsPref<V>(v: V) {
+  return validate<MutedWordsPref & V>(v, id, hashMutedWordsPref)
 }
 
-export function validateMutedWordsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#mutedWordsPref`,
-    v,
-  ) as ValidationResult<MutedWordsPref>
+export function isValidMutedWordsPref<V>(v: V) {
+  return isValid<MutedWordsPref>(v, id, hashMutedWordsPref)
 }
 
 export interface HiddenPostsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
   /** A list of URIs of posts the account owner has hidden. */
   items: string[]
-  [k: string]: unknown
 }
 
-export function isHiddenPostsPref(
-  v: unknown,
-): v is HiddenPostsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
-} {
-  return is$typed(v, id, 'hiddenPostsPref')
+const hashHiddenPostsPref = 'hiddenPostsPref'
+
+export function isHiddenPostsPref<V>(v: V) {
+  return is$typed(v, id, hashHiddenPostsPref)
+}
+
+export function validateHiddenPostsPref<V>(v: V) {
+  return validate<HiddenPostsPref & V>(v, id, hashHiddenPostsPref)
 }
 
-export function validateHiddenPostsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#hiddenPostsPref`,
-    v,
-  ) as ValidationResult<HiddenPostsPref>
+export function isValidHiddenPostsPref<V>(v: V) {
+  return isValid<HiddenPostsPref>(v, id, hashHiddenPostsPref)
 }
 
 export interface LabelersPref {
+  $type?: $Type<'app.bsky.actor.defs', 'labelersPref'>
   labelers: LabelerPrefItem[]
-  [k: string]: unknown
 }
 
-export function isLabelersPref(
-  v: unknown,
-): v is LabelersPref & { $type: $Type<'app.bsky.actor.defs', 'labelersPref'> } {
-  return is$typed(v, id, 'labelersPref')
+const hashLabelersPref = 'labelersPref'
+
+export function isLabelersPref<V>(v: V) {
+  return is$typed(v, id, hashLabelersPref)
 }
 
-export function validateLabelersPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelersPref`,
-    v,
-  ) as ValidationResult<LabelersPref>
+export function validateLabelersPref<V>(v: V) {
+  return validate<LabelersPref & V>(v, id, hashLabelersPref)
+}
+
+export function isValidLabelersPref<V>(v: V) {
+  return isValid<LabelersPref>(v, id, hashLabelersPref)
 }
 
 export interface LabelerPrefItem {
+  $type?: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
   did: string
-  [k: string]: unknown
 }
 
-export function isLabelerPrefItem(
-  v: unknown,
-): v is LabelerPrefItem & {
-  $type: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
-} {
-  return is$typed(v, id, 'labelerPrefItem')
+const hashLabelerPrefItem = 'labelerPrefItem'
+
+export function isLabelerPrefItem<V>(v: V) {
+  return is$typed(v, id, hashLabelerPrefItem)
+}
+
+export function validateLabelerPrefItem<V>(v: V) {
+  return validate<LabelerPrefItem & V>(v, id, hashLabelerPrefItem)
 }
 
-export function validateLabelerPrefItem(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerPrefItem`,
-    v,
-  ) as ValidationResult<LabelerPrefItem>
+export function isValidLabelerPrefItem<V>(v: V) {
+  return isValid<LabelerPrefItem>(v, id, hashLabelerPrefItem)
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
 export interface BskyAppStatePref {
+  $type?: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
   activeProgressGuide?: BskyAppProgressGuide
   /** An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. */
   queuedNudges?: string[]
   /** Storage for NUXs the user has encountered. */
   nuxs?: Nux[]
-  [k: string]: unknown
 }
 
-export function isBskyAppStatePref(
-  v: unknown,
-): v is BskyAppStatePref & {
-  $type: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
-} {
-  return is$typed(v, id, 'bskyAppStatePref')
+const hashBskyAppStatePref = 'bskyAppStatePref'
+
+export function isBskyAppStatePref<V>(v: V) {
+  return is$typed(v, id, hashBskyAppStatePref)
+}
+
+export function validateBskyAppStatePref<V>(v: V) {
+  return validate<BskyAppStatePref & V>(v, id, hashBskyAppStatePref)
 }
 
-export function validateBskyAppStatePref(v: unknown) {
-  return lexicons.validate(
-    `${id}#bskyAppStatePref`,
-    v,
-  ) as ValidationResult<BskyAppStatePref>
+export function isValidBskyAppStatePref<V>(v: V) {
+  return isValid<BskyAppStatePref>(v, id, hashBskyAppStatePref)
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
 export interface BskyAppProgressGuide {
+  $type?: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
   guide: string
-  [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(
-  v: unknown,
-): v is BskyAppProgressGuide & {
-  $type: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
-} {
-  return is$typed(v, id, 'bskyAppProgressGuide')
+const hashBskyAppProgressGuide = 'bskyAppProgressGuide'
+
+export function isBskyAppProgressGuide<V>(v: V) {
+  return is$typed(v, id, hashBskyAppProgressGuide)
 }
 
-export function validateBskyAppProgressGuide(v: unknown) {
-  return lexicons.validate(
-    `${id}#bskyAppProgressGuide`,
-    v,
-  ) as ValidationResult<BskyAppProgressGuide>
+export function validateBskyAppProgressGuide<V>(v: V) {
+  return validate<BskyAppProgressGuide & V>(v, id, hashBskyAppProgressGuide)
+}
+
+export function isValidBskyAppProgressGuide<V>(v: V) {
+  return isValid<BskyAppProgressGuide>(v, id, hashBskyAppProgressGuide)
 }
 
 /** A new user experiences (NUX) storage object */
 export interface Nux {
+  $type?: $Type<'app.bsky.actor.defs', 'nux'>
   id: string
   completed: boolean
   /** Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters. */
   data?: string
   /** The date and time at which the NUX will expire and should be considered completed. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isNux(
-  v: unknown,
-): v is Nux & { $type: $Type<'app.bsky.actor.defs', 'nux'> } {
-  return is$typed(v, id, 'nux')
+const hashNux = 'nux'
+
+export function isNux<V>(v: V) {
+  return is$typed(v, id, hashNux)
+}
+
+export function validateNux<V>(v: V) {
+  return validate<Nux & V>(v, id, hashNux)
 }
 
-export function validateNux(v: unknown) {
-  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
+export function isValidNux<V>(v: V) {
+  return isValid<Nux>(v, id, hashNux)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
index 680cdd0967d..5137eefd413 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getPreferences'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
index 2ce818e78d1..4bac12add6a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getProfile'
 
 export interface QueryParams {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 354d8677cc1..26c6aebec00 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getProfiles'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   profiles: AppBskyActorDefs.ProfileViewDetailed[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index 1690000cb13..a06adb17957 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getSuggestions'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
index 9c71f43c191..666b6c48976 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.profile'
 
 export interface Record {
+  $type?: $Type<'app.bsky.actor.profile', 'main'>
   displayName?: string
   /** Free-form profile description text. */
   description?: string
@@ -18,21 +25,23 @@ export interface Record {
   avatar?: BlobRef
   /** Larger horizontal image to display behind profile view. */
   banner?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   joinedViaStarterPack?: ComAtprotoRepoStrongRef.Main
   pinnedPost?: ComAtprotoRepoStrongRef.Main
   createdAt?: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.actor.profile', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
index ecedca7927f..ccb8c277542 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -4,18 +4,23 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
index 5b788366ee5..ea9f15b5440 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.searchActors'
 
 export interface QueryParams {
@@ -25,7 +31,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index 754e2e8db17..e3448e6a100 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.searchActorsTypeahead'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
index 299c6f4e414..73c40d8bdcb 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
@@ -3,27 +3,34 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
+  $type?: $Type<'app.bsky.embed.defs', 'aspectRatio'>
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isAspectRatio(
-  v: unknown,
-): v is AspectRatio & { $type: $Type<'app.bsky.embed.defs', 'aspectRatio'> } {
-  return is$typed(v, id, 'aspectRatio')
+const hashAspectRatio = 'aspectRatio'
+
+export function isAspectRatio<V>(v: V) {
+  return is$typed(v, id, hashAspectRatio)
+}
+
+export function validateAspectRatio<V>(v: V) {
+  return validate<AspectRatio & V>(v, id, hashAspectRatio)
 }
 
-export function validateAspectRatio(v: unknown) {
-  return lexicons.validate(
-    `${id}#aspectRatio`,
-    v,
-  ) as ValidationResult<AspectRatio>
+export function isValidAspectRatio<V>(v: V) {
+  return isValid<AspectRatio>(v, id, hashAspectRatio)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
index c8e6fd15147..1e4a775c3fe 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
@@ -3,79 +3,96 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
+  $type?: $Type<'app.bsky.embed.external', 'main'>
   external: External
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.external', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface External {
+  $type?: $Type<'app.bsky.embed.external', 'external'>
   uri: string
   title: string
   description: string
   thumb?: BlobRef
-  [k: string]: unknown
 }
 
-export function isExternal(
-  v: unknown,
-): v is External & { $type: $Type<'app.bsky.embed.external', 'external'> } {
-  return is$typed(v, id, 'external')
+const hashExternal = 'external'
+
+export function isExternal<V>(v: V) {
+  return is$typed(v, id, hashExternal)
+}
+
+export function validateExternal<V>(v: V) {
+  return validate<External & V>(v, id, hashExternal)
 }
 
-export function validateExternal(v: unknown) {
-  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
+export function isValidExternal<V>(v: V) {
+  return isValid<External>(v, id, hashExternal)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.external', 'view'>
   external: ViewExternal
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.external', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewExternal {
+  $type?: $Type<'app.bsky.embed.external', 'viewExternal'>
   uri: string
   title: string
   description: string
   thumb?: string
-  [k: string]: unknown
 }
 
-export function isViewExternal(
-  v: unknown,
-): v is ViewExternal & {
-  $type: $Type<'app.bsky.embed.external', 'viewExternal'>
-} {
-  return is$typed(v, id, 'viewExternal')
+const hashViewExternal = 'viewExternal'
+
+export function isViewExternal<V>(v: V) {
+  return is$typed(v, id, hashViewExternal)
+}
+
+export function validateViewExternal<V>(v: V) {
+  return validate<ViewExternal & V>(v, id, hashViewExternal)
 }
 
-export function validateViewExternal(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewExternal`,
-    v,
-  ) as ValidationResult<ViewExternal>
+export function isValidViewExternal<V>(v: V) {
+  return isValid<ViewExternal>(v, id, hashViewExternal)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
index 0fd622ba6c2..d0c14d0f827 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
@@ -3,61 +3,80 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyEmbedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.images'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.images', 'main'>
   images: Image[]
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.images', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface Image {
+  $type?: $Type<'app.bsky.embed.images', 'image'>
   image: BlobRef
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isImage(
-  v: unknown,
-): v is Image & { $type: $Type<'app.bsky.embed.images', 'image'> } {
-  return is$typed(v, id, 'image')
+const hashImage = 'image'
+
+export function isImage<V>(v: V) {
+  return is$typed(v, id, hashImage)
+}
+
+export function validateImage<V>(v: V) {
+  return validate<Image & V>(v, id, hashImage)
 }
 
-export function validateImage(v: unknown) {
-  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
+export function isValidImage<V>(v: V) {
+  return isValid<Image>(v, id, hashImage)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.images', 'view'>
   images: ViewImage[]
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.images', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewImage {
+  $type?: $Type<'app.bsky.embed.images', 'viewImage'>
   /** Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. */
   thumb: string
   /** Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. */
@@ -65,15 +84,18 @@ export interface ViewImage {
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isViewImage(
-  v: unknown,
-): v is ViewImage & { $type: $Type<'app.bsky.embed.images', 'viewImage'> } {
-  return is$typed(v, id, 'viewImage')
+const hashViewImage = 'viewImage'
+
+export function isViewImage<V>(v: V) {
+  return is$typed(v, id, hashViewImage)
+}
+
+export function validateViewImage<V>(v: V) {
+  return validate<ViewImage & V>(v, id, hashViewImage)
 }
 
-export function validateViewImage(v: unknown) {
-  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
+export function isValidViewImage<V>(v: V) {
+  return isValid<ViewImage>(v, id, hashViewImage)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
index cdfe527f361..082545b5db4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
@@ -3,154 +3,168 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedDefs from '../feed/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as AppBskyLabelerDefs from '../labeler/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
-import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as AppBskyFeedDefs from '../feed/defs'
+import type * as AppBskyGraphDefs from '../graph/defs'
+import type * as AppBskyLabelerDefs from '../labeler/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyEmbedImages from './images'
+import type * as AppBskyEmbedVideo from './video'
+import type * as AppBskyEmbedExternal from './external'
+import type * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.record'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.record', 'main'>
   record: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.record', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
+}
+
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.record', 'view'>
   record:
-    | ViewRecord
-    | ViewNotFound
-    | ViewBlocked
-    | ViewDetached
-    | AppBskyFeedDefs.GeneratorView
-    | AppBskyGraphDefs.ListView
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ViewRecord>
+    | $Typed<ViewNotFound>
+    | $Typed<ViewBlocked>
+    | $Typed<ViewDetached>
+    | $Typed<AppBskyFeedDefs.GeneratorView>
+    | $Typed<AppBskyGraphDefs.ListView>
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyGraphDefs.StarterPackViewBasic>
+    | { $type: string }
+}
+
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.record', 'view'> } {
-  return is$typed(v, id, 'view')
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewRecord {
+  $type?: $Type<'app.bsky.embed.record', 'viewRecord'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
   /** The record data itself. */
-  value: {}
+  value: { [_ in string]: unknown }
   labels?: ComAtprotoLabelDefs.Label[]
   replyCount?: number
   repostCount?: number
   likeCount?: number
   quoteCount?: number
   embeds?: (
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   )[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isViewRecord(
-  v: unknown,
-): v is ViewRecord & { $type: $Type<'app.bsky.embed.record', 'viewRecord'> } {
-  return is$typed(v, id, 'viewRecord')
+const hashViewRecord = 'viewRecord'
+
+export function isViewRecord<V>(v: V) {
+  return is$typed(v, id, hashViewRecord)
+}
+
+export function validateViewRecord<V>(v: V) {
+  return validate<ViewRecord & V>(v, id, hashViewRecord)
 }
 
-export function validateViewRecord(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewRecord`,
-    v,
-  ) as ValidationResult<ViewRecord>
+export function isValidViewRecord<V>(v: V) {
+  return isValid<ViewRecord>(v, id, hashViewRecord)
 }
 
 export interface ViewNotFound {
+  $type?: $Type<'app.bsky.embed.record', 'viewNotFound'>
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isViewNotFound(
-  v: unknown,
-): v is ViewNotFound & {
-  $type: $Type<'app.bsky.embed.record', 'viewNotFound'>
-} {
-  return is$typed(v, id, 'viewNotFound')
+const hashViewNotFound = 'viewNotFound'
+
+export function isViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashViewNotFound)
+}
+
+export function validateViewNotFound<V>(v: V) {
+  return validate<ViewNotFound & V>(v, id, hashViewNotFound)
 }
 
-export function validateViewNotFound(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewNotFound`,
-    v,
-  ) as ValidationResult<ViewNotFound>
+export function isValidViewNotFound<V>(v: V) {
+  return isValid<ViewNotFound>(v, id, hashViewNotFound)
 }
 
 export interface ViewBlocked {
+  $type?: $Type<'app.bsky.embed.record', 'viewBlocked'>
   uri: string
   blocked: true
   author: AppBskyFeedDefs.BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isViewBlocked(
-  v: unknown,
-): v is ViewBlocked & { $type: $Type<'app.bsky.embed.record', 'viewBlocked'> } {
-  return is$typed(v, id, 'viewBlocked')
+const hashViewBlocked = 'viewBlocked'
+
+export function isViewBlocked<V>(v: V) {
+  return is$typed(v, id, hashViewBlocked)
 }
 
-export function validateViewBlocked(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewBlocked`,
-    v,
-  ) as ValidationResult<ViewBlocked>
+export function validateViewBlocked<V>(v: V) {
+  return validate<ViewBlocked & V>(v, id, hashViewBlocked)
+}
+
+export function isValidViewBlocked<V>(v: V) {
+  return isValid<ViewBlocked>(v, id, hashViewBlocked)
 }
 
 export interface ViewDetached {
+  $type?: $Type<'app.bsky.embed.record', 'viewDetached'>
   uri: string
   detached: true
-  [k: string]: unknown
 }
 
-export function isViewDetached(
-  v: unknown,
-): v is ViewDetached & {
-  $type: $Type<'app.bsky.embed.record', 'viewDetached'>
-} {
-  return is$typed(v, id, 'viewDetached')
+const hashViewDetached = 'viewDetached'
+
+export function isViewDetached<V>(v: V) {
+  return is$typed(v, id, hashViewDetached)
+}
+
+export function validateViewDetached<V>(v: V) {
+  return validate<ViewDetached & V>(v, id, hashViewDetached)
 }
 
-export function validateViewDetached(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewDetached`,
-    v,
-  ) as ValidationResult<ViewDetached>
+export function isValidViewDetached<V>(v: V) {
+  return isValid<ViewDetached>(v, id, hashViewDetached)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
index 9af46777257..c22958741f3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -3,51 +3,65 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyEmbedRecord from './record'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedRecord from './record'
+import type * as AppBskyEmbedImages from './images'
+import type * as AppBskyEmbedVideo from './video'
+import type * as AppBskyEmbedExternal from './external'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.recordWithMedia'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.recordWithMedia', 'main'>
   record: AppBskyEmbedRecord.Main
   media:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | { $type: string }
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.recordWithMedia', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.recordWithMedia', 'view'>
   record: AppBskyEmbedRecord.View
   media:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | { $type: string }
+}
+
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.recordWithMedia', 'view'> } {
-  return is$typed(v, id, 'view')
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
index e504f8adce9..3b8880139a1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
@@ -3,62 +3,80 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyEmbedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.video'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.video', 'main'>
   video: BlobRef
   captions?: Caption[]
   /** Alt text description of the video, for accessibility. */
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.video', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface Caption {
+  $type?: $Type<'app.bsky.embed.video', 'caption'>
   lang: string
   file: BlobRef
-  [k: string]: unknown
 }
 
-export function isCaption(
-  v: unknown,
-): v is Caption & { $type: $Type<'app.bsky.embed.video', 'caption'> } {
-  return is$typed(v, id, 'caption')
+const hashCaption = 'caption'
+
+export function isCaption<V>(v: V) {
+  return is$typed(v, id, hashCaption)
 }
 
-export function validateCaption(v: unknown) {
-  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
+export function validateCaption<V>(v: V) {
+  return validate<Caption & V>(v, id, hashCaption)
+}
+
+export function isValidCaption<V>(v: V) {
+  return isValid<Caption>(v, id, hashCaption)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.video', 'view'>
   cid: string
   playlist: string
   thumbnail?: string
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.video', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
index 573aeb47244..1269ef50b0a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
@@ -3,32 +3,39 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyGraphDefs from '../graph/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyEmbedImages from '../embed/images'
+import type * as AppBskyEmbedVideo from '../embed/video'
+import type * as AppBskyEmbedExternal from '../embed/external'
+import type * as AppBskyEmbedRecord from '../embed/record'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyGraphDefs from '../graph/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.defs'
 
 export interface PostView {
+  $type?: $Type<'app.bsky.feed.defs', 'postView'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
-  record: {}
+  record: { [_ in string]: unknown }
   embed?:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | AppBskyEmbedRecord.View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   replyCount?: number
   repostCount?: number
   likeCount?: number
@@ -37,215 +44,230 @@ export interface PostView {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   threadgate?: ThreadgateView
-  [k: string]: unknown
 }
 
-export function isPostView(
-  v: unknown,
-): v is PostView & { $type: $Type<'app.bsky.feed.defs', 'postView'> } {
-  return is$typed(v, id, 'postView')
+const hashPostView = 'postView'
+
+export function isPostView<V>(v: V) {
+  return is$typed(v, id, hashPostView)
+}
+
+export function validatePostView<V>(v: V) {
+  return validate<PostView & V>(v, id, hashPostView)
 }
 
-export function validatePostView(v: unknown) {
-  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
+export function isValidPostView<V>(v: V) {
+  return isValid<PostView>(v, id, hashPostView)
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: $Type<'app.bsky.feed.defs', 'viewerState'>
   repost?: string
   like?: string
   threadMuted?: boolean
   replyDisabled?: boolean
   embeddingDisabled?: boolean
   pinned?: boolean
-  [k: string]: unknown
 }
 
-export function isViewerState(
-  v: unknown,
-): v is ViewerState & { $type: $Type<'app.bsky.feed.defs', 'viewerState'> } {
-  return is$typed(v, id, 'viewerState')
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
+}
+
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerState`,
-    v,
-  ) as ValidationResult<ViewerState>
+export function isValidViewerState<V>(v: V) {
+  return isValid<ViewerState>(v, id, hashViewerState)
 }
 
 export interface FeedViewPost {
+  $type?: $Type<'app.bsky.feed.defs', 'feedViewPost'>
   post: PostView
   reply?: ReplyRef
-  reason?: ReasonRepost | ReasonPin | { $type: string; [k: string]: unknown }
+  reason?: $Typed<ReasonRepost> | $Typed<ReasonPin> | { $type: string }
   /** Context provided by feed generator that may be passed back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isFeedViewPost(
-  v: unknown,
-): v is FeedViewPost & { $type: $Type<'app.bsky.feed.defs', 'feedViewPost'> } {
-  return is$typed(v, id, 'feedViewPost')
+const hashFeedViewPost = 'feedViewPost'
+
+export function isFeedViewPost<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPost)
+}
+
+export function validateFeedViewPost<V>(v: V) {
+  return validate<FeedViewPost & V>(v, id, hashFeedViewPost)
 }
 
-export function validateFeedViewPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#feedViewPost`,
-    v,
-  ) as ValidationResult<FeedViewPost>
+export function isValidFeedViewPost<V>(v: V) {
+  return isValid<FeedViewPost>(v, id, hashFeedViewPost)
 }
 
 export interface ReplyRef {
+  $type?: $Type<'app.bsky.feed.defs', 'replyRef'>
   root:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   parent:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
-  [k: string]: unknown
 }
 
-export function isReplyRef(
-  v: unknown,
-): v is ReplyRef & { $type: $Type<'app.bsky.feed.defs', 'replyRef'> } {
-  return is$typed(v, id, 'replyRef')
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
+}
+
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown) {
-  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
+export function isValidReplyRef<V>(v: V) {
+  return isValid<ReplyRef>(v, id, hashReplyRef)
 }
 
 export interface ReasonRepost {
+  $type?: $Type<'app.bsky.feed.defs', 'reasonRepost'>
   by: AppBskyActorDefs.ProfileViewBasic
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isReasonRepost(
-  v: unknown,
-): v is ReasonRepost & { $type: $Type<'app.bsky.feed.defs', 'reasonRepost'> } {
-  return is$typed(v, id, 'reasonRepost')
+const hashReasonRepost = 'reasonRepost'
+
+export function isReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashReasonRepost)
+}
+
+export function validateReasonRepost<V>(v: V) {
+  return validate<ReasonRepost & V>(v, id, hashReasonRepost)
 }
 
-export function validateReasonRepost(v: unknown) {
-  return lexicons.validate(
-    `${id}#reasonRepost`,
-    v,
-  ) as ValidationResult<ReasonRepost>
+export function isValidReasonRepost<V>(v: V) {
+  return isValid<ReasonRepost>(v, id, hashReasonRepost)
 }
 
 export interface ReasonPin {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.defs', 'reasonPin'>
 }
 
-export function isReasonPin(
-  v: unknown,
-): v is ReasonPin & { $type: $Type<'app.bsky.feed.defs', 'reasonPin'> } {
-  return is$typed(v, id, 'reasonPin')
+const hashReasonPin = 'reasonPin'
+
+export function isReasonPin<V>(v: V) {
+  return is$typed(v, id, hashReasonPin)
 }
 
-export function validateReasonPin(v: unknown) {
-  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
+export function validateReasonPin<V>(v: V) {
+  return validate<ReasonPin & V>(v, id, hashReasonPin)
+}
+
+export function isValidReasonPin<V>(v: V) {
+  return isValid<ReasonPin>(v, id, hashReasonPin)
 }
 
 export interface ThreadViewPost {
+  $type?: $Type<'app.bsky.feed.defs', 'threadViewPost'>
   post: PostView
   parent?:
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   replies?: (
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
-export function isThreadViewPost(
-  v: unknown,
-): v is ThreadViewPost & {
-  $type: $Type<'app.bsky.feed.defs', 'threadViewPost'>
-} {
-  return is$typed(v, id, 'threadViewPost')
+const hashThreadViewPost = 'threadViewPost'
+
+export function isThreadViewPost<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPost)
 }
 
-export function validateThreadViewPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadViewPost`,
-    v,
-  ) as ValidationResult<ThreadViewPost>
+export function validateThreadViewPost<V>(v: V) {
+  return validate<ThreadViewPost & V>(v, id, hashThreadViewPost)
+}
+
+export function isValidThreadViewPost<V>(v: V) {
+  return isValid<ThreadViewPost>(v, id, hashThreadViewPost)
 }
 
 export interface NotFoundPost {
+  $type?: $Type<'app.bsky.feed.defs', 'notFoundPost'>
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundPost(
-  v: unknown,
-): v is NotFoundPost & { $type: $Type<'app.bsky.feed.defs', 'notFoundPost'> } {
-  return is$typed(v, id, 'notFoundPost')
+const hashNotFoundPost = 'notFoundPost'
+
+export function isNotFoundPost<V>(v: V) {
+  return is$typed(v, id, hashNotFoundPost)
+}
+
+export function validateNotFoundPost<V>(v: V) {
+  return validate<NotFoundPost & V>(v, id, hashNotFoundPost)
 }
 
-export function validateNotFoundPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#notFoundPost`,
-    v,
-  ) as ValidationResult<NotFoundPost>
+export function isValidNotFoundPost<V>(v: V) {
+  return isValid<NotFoundPost>(v, id, hashNotFoundPost)
 }
 
 export interface BlockedPost {
+  $type?: $Type<'app.bsky.feed.defs', 'blockedPost'>
   uri: string
   blocked: true
   author: BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isBlockedPost(
-  v: unknown,
-): v is BlockedPost & { $type: $Type<'app.bsky.feed.defs', 'blockedPost'> } {
-  return is$typed(v, id, 'blockedPost')
+const hashBlockedPost = 'blockedPost'
+
+export function isBlockedPost<V>(v: V) {
+  return is$typed(v, id, hashBlockedPost)
+}
+
+export function validateBlockedPost<V>(v: V) {
+  return validate<BlockedPost & V>(v, id, hashBlockedPost)
 }
 
-export function validateBlockedPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#blockedPost`,
-    v,
-  ) as ValidationResult<BlockedPost>
+export function isValidBlockedPost<V>(v: V) {
+  return isValid<BlockedPost>(v, id, hashBlockedPost)
 }
 
 export interface BlockedAuthor {
+  $type?: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
   did: string
   viewer?: AppBskyActorDefs.ViewerState
-  [k: string]: unknown
 }
 
-export function isBlockedAuthor(
-  v: unknown,
-): v is BlockedAuthor & {
-  $type: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
-} {
-  return is$typed(v, id, 'blockedAuthor')
+const hashBlockedAuthor = 'blockedAuthor'
+
+export function isBlockedAuthor<V>(v: V) {
+  return is$typed(v, id, hashBlockedAuthor)
 }
 
-export function validateBlockedAuthor(v: unknown) {
-  return lexicons.validate(
-    `${id}#blockedAuthor`,
-    v,
-  ) as ValidationResult<BlockedAuthor>
+export function validateBlockedAuthor<V>(v: V) {
+  return validate<BlockedAuthor & V>(v, id, hashBlockedAuthor)
+}
+
+export function isValidBlockedAuthor<V>(v: V) {
+  return isValid<BlockedAuthor>(v, id, hashBlockedAuthor)
 }
 
 export interface GeneratorView {
+  $type?: $Type<'app.bsky.feed.defs', 'generatorView'>
   uri: string
   cid: string
   did: string
@@ -259,133 +281,127 @@ export interface GeneratorView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: GeneratorViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isGeneratorView(
-  v: unknown,
-): v is GeneratorView & {
-  $type: $Type<'app.bsky.feed.defs', 'generatorView'>
-} {
-  return is$typed(v, id, 'generatorView')
+const hashGeneratorView = 'generatorView'
+
+export function isGeneratorView<V>(v: V) {
+  return is$typed(v, id, hashGeneratorView)
 }
 
-export function validateGeneratorView(v: unknown) {
-  return lexicons.validate(
-    `${id}#generatorView`,
-    v,
-  ) as ValidationResult<GeneratorView>
+export function validateGeneratorView<V>(v: V) {
+  return validate<GeneratorView & V>(v, id, hashGeneratorView)
+}
+
+export function isValidGeneratorView<V>(v: V) {
+  return isValid<GeneratorView>(v, id, hashGeneratorView)
 }
 
 export interface GeneratorViewerState {
+  $type?: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
   like?: string
-  [k: string]: unknown
 }
 
-export function isGeneratorViewerState(
-  v: unknown,
-): v is GeneratorViewerState & {
-  $type: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
-} {
-  return is$typed(v, id, 'generatorViewerState')
+const hashGeneratorViewerState = 'generatorViewerState'
+
+export function isGeneratorViewerState<V>(v: V) {
+  return is$typed(v, id, hashGeneratorViewerState)
+}
+
+export function validateGeneratorViewerState<V>(v: V) {
+  return validate<GeneratorViewerState & V>(v, id, hashGeneratorViewerState)
 }
 
-export function validateGeneratorViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#generatorViewerState`,
-    v,
-  ) as ValidationResult<GeneratorViewerState>
+export function isValidGeneratorViewerState<V>(v: V) {
+  return isValid<GeneratorViewerState>(v, id, hashGeneratorViewerState)
 }
 
 export interface SkeletonFeedPost {
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
   post: string
   reason?:
-    | SkeletonReasonRepost
-    | SkeletonReasonPin
-    | { $type: string; [k: string]: unknown }
+    | $Typed<SkeletonReasonRepost>
+    | $Typed<SkeletonReasonPin>
+    | { $type: string }
   /** Context that will be passed through to client and may be passed to feed generator back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(
-  v: unknown,
-): v is SkeletonFeedPost & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
-} {
-  return is$typed(v, id, 'skeletonFeedPost')
+const hashSkeletonFeedPost = 'skeletonFeedPost'
+
+export function isSkeletonFeedPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonFeedPost)
+}
+
+export function validateSkeletonFeedPost<V>(v: V) {
+  return validate<SkeletonFeedPost & V>(v, id, hashSkeletonFeedPost)
 }
 
-export function validateSkeletonFeedPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonFeedPost`,
-    v,
-  ) as ValidationResult<SkeletonFeedPost>
+export function isValidSkeletonFeedPost<V>(v: V) {
+  return isValid<SkeletonFeedPost>(v, id, hashSkeletonFeedPost)
 }
 
 export interface SkeletonReasonRepost {
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
   repost: string
-  [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(
-  v: unknown,
-): v is SkeletonReasonRepost & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
-} {
-  return is$typed(v, id, 'skeletonReasonRepost')
+const hashSkeletonReasonRepost = 'skeletonReasonRepost'
+
+export function isSkeletonReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonRepost)
+}
+
+export function validateSkeletonReasonRepost<V>(v: V) {
+  return validate<SkeletonReasonRepost & V>(v, id, hashSkeletonReasonRepost)
 }
 
-export function validateSkeletonReasonRepost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonReasonRepost`,
-    v,
-  ) as ValidationResult<SkeletonReasonRepost>
+export function isValidSkeletonReasonRepost<V>(v: V) {
+  return isValid<SkeletonReasonRepost>(v, id, hashSkeletonReasonRepost)
 }
 
 export interface SkeletonReasonPin {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
+}
+
+const hashSkeletonReasonPin = 'skeletonReasonPin'
+
+export function isSkeletonReasonPin<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonPin)
 }
 
-export function isSkeletonReasonPin(
-  v: unknown,
-): v is SkeletonReasonPin & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
-} {
-  return is$typed(v, id, 'skeletonReasonPin')
+export function validateSkeletonReasonPin<V>(v: V) {
+  return validate<SkeletonReasonPin & V>(v, id, hashSkeletonReasonPin)
 }
 
-export function validateSkeletonReasonPin(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonReasonPin`,
-    v,
-  ) as ValidationResult<SkeletonReasonPin>
+export function isValidSkeletonReasonPin<V>(v: V) {
+  return isValid<SkeletonReasonPin>(v, id, hashSkeletonReasonPin)
 }
 
 export interface ThreadgateView {
+  $type?: $Type<'app.bsky.feed.defs', 'threadgateView'>
   uri?: string
   cid?: string
-  record?: {}
+  record?: { [_ in string]: unknown }
   lists?: AppBskyGraphDefs.ListViewBasic[]
-  [k: string]: unknown
 }
 
-export function isThreadgateView(
-  v: unknown,
-): v is ThreadgateView & {
-  $type: $Type<'app.bsky.feed.defs', 'threadgateView'>
-} {
-  return is$typed(v, id, 'threadgateView')
+const hashThreadgateView = 'threadgateView'
+
+export function isThreadgateView<V>(v: V) {
+  return is$typed(v, id, hashThreadgateView)
+}
+
+export function validateThreadgateView<V>(v: V) {
+  return validate<ThreadgateView & V>(v, id, hashThreadgateView)
 }
 
-export function validateThreadgateView(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadgateView`,
-    v,
-  ) as ValidationResult<ThreadgateView>
+export function isValidThreadgateView<V>(v: V) {
+  return isValid<ThreadgateView>(v, id, hashThreadgateView)
 }
 
 export interface Interaction {
+  $type?: $Type<'app.bsky.feed.defs', 'interaction'>
   item?: string
   event?:
     | 'app.bsky.feed.defs#requestLess'
@@ -403,20 +419,20 @@ export interface Interaction {
     | (string & {})
   /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isInteraction(
-  v: unknown,
-): v is Interaction & { $type: $Type<'app.bsky.feed.defs', 'interaction'> } {
-  return is$typed(v, id, 'interaction')
+const hashInteraction = 'interaction'
+
+export function isInteraction<V>(v: V) {
+  return is$typed(v, id, hashInteraction)
+}
+
+export function validateInteraction<V>(v: V) {
+  return validate<Interaction & V>(v, id, hashInteraction)
 }
 
-export function validateInteraction(v: unknown) {
-  return lexicons.validate(
-    `${id}#interaction`,
-    v,
-  ) as ValidationResult<Interaction>
+export function isValidInteraction<V>(v: V) {
+  return isValid<Interaction>(v, id, hashInteraction)
 }
 
 /** Request that less content like the given feed item be shown in the feed */
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index b76b12a9e41..10f46121fee 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.describeFeedGenerator'
 
 export interface QueryParams {}
@@ -18,7 +24,6 @@ export interface OutputSchema {
   did: string
   feeds: Feed[]
   links?: Links
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -47,34 +52,40 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Feed {
+  $type?: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeed(
-  v: unknown,
-): v is Feed & { $type: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'> } {
-  return is$typed(v, id, 'feed')
+const hashFeed = 'feed'
+
+export function isFeed<V>(v: V) {
+  return is$typed(v, id, hashFeed)
+}
+
+export function validateFeed<V>(v: V) {
+  return validate<Feed & V>(v, id, hashFeed)
 }
 
-export function validateFeed(v: unknown) {
-  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
+export function isValidFeed<V>(v: V) {
+  return isValid<Feed>(v, id, hashFeed)
 }
 
 export interface Links {
+  $type?: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(
-  v: unknown,
-): v is Links & {
-  $type: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
-} {
-  return is$typed(v, id, 'links')
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
+}
+
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown) {
-  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
+export function isValidLinks<V>(v: V) {
+  return isValid<Links>(v, id, hashLinks)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
index 2fac60cbf6e..9c7a3fc0d62 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.generator'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.generator', 'main'>
   did: string
   displayName: string
   description?: string
@@ -18,19 +25,21 @@ export interface Record {
   avatar?: BlobRef
   /** Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions */
   acceptsInteractions?: boolean
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.generator', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index a680bebbc7e..0dfc3b407bc 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getActorFeeds'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index 5d2852087d7..ef497af6abb 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getActorLikes'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 7719ac0368a..d0f6e778bfa 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getAuthorFeed'
 
 export interface QueryParams {
@@ -30,7 +36,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
index 9224f829059..9e2fa1a11a0 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeed'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index c3981ea75b4..a742ec87ff0 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedGenerator'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export interface OutputSchema {
   isOnline: boolean
   /** Indicates whether the feed generator service is compatible with the record declaration. */
   isValid: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 4745177b4b5..43806b8e4e2 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedGenerators'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index 07eba8c59f4..abce42e5850 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedSkeleton'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.SkeletonFeedPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
index 190905772f5..629f1375eaf 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getLikes'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   likes: Like[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -56,18 +61,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Like {
+  $type?: $Type<'app.bsky.feed.getLikes', 'like'>
   indexedAt: string
   createdAt: string
   actor: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isLike(
-  v: unknown,
-): v is Like & { $type: $Type<'app.bsky.feed.getLikes', 'like'> } {
-  return is$typed(v, id, 'like')
+const hashLike = 'like'
+
+export function isLike<V>(v: V) {
+  return is$typed(v, id, hashLike)
+}
+
+export function validateLike<V>(v: V) {
+  return validate<Like & V>(v, id, hashLike)
 }
 
-export function validateLike(v: unknown) {
-  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
+export function isValidLike<V>(v: V) {
+  return isValid<Like>(v, id, hashLike)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
index a31bb6ddd62..067825731a3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getListFeed'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 444eac417c3..b9050722e41 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getPostThread'
 
 export interface QueryParams {
@@ -24,12 +30,11 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   thread:
-    | AppBskyFeedDefs.ThreadViewPost
-    | AppBskyFeedDefs.NotFoundPost
-    | AppBskyFeedDefs.BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedDefs.ThreadViewPost>
+    | $Typed<AppBskyFeedDefs.NotFoundPost>
+    | $Typed<AppBskyFeedDefs.BlockedPost>
+    | { $type: string }
   threadgate?: AppBskyFeedDefs.ThreadgateView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
index da6bf3696e2..02dffc9281c 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getPosts'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
index c71113bace2..51413c79fb1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getQuotes'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index 25bf3c8f81b..77b81b96561 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getRepostedBy'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   repostedBy: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index c34be54afdc..fbf789c54d6 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getSuggestedFeeds'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
index e3f1f0ce0bc..55b8acc1e7a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getTimeline'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
index 17f3d126a33..08ede56a096 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.like'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.like', 'main'>
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.like', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
index cc632e3e4c8..8fcd72f9ac9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
@@ -3,20 +3,27 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyEmbedImages from '../embed/images'
+import type * as AppBskyEmbedVideo from '../embed/video'
+import type * as AppBskyEmbedExternal from '../embed/external'
+import type * as AppBskyEmbedRecord from '../embed/record'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.post'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.post', 'main'>
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
   /** DEPRECATED: replaced by app.bsky.richtext.facet. */
@@ -25,17 +32,15 @@ export interface Record {
   facets?: AppBskyRichtextFacet.Main[]
   reply?: ReplyRef
   embed?:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | AppBskyEmbedRecord.Main
-    | AppBskyEmbedRecordWithMedia.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | $Typed<AppBskyEmbedRecord.Main>
+    | $Typed<AppBskyEmbedRecordWithMedia.Main>
+    | { $type: string }
   /** Indicates human language of post primary text content. */
   langs?: string[]
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   /** Additional hashtags, in addition to any included in post text and facets. */
   tags?: string[]
   /** Client-declared timestamp when this post was originally created. */
@@ -43,64 +48,80 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.post', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 export interface ReplyRef {
+  $type?: $Type<'app.bsky.feed.post', 'replyRef'>
   root: ComAtprotoRepoStrongRef.Main
   parent: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isReplyRef(
-  v: unknown,
-): v is ReplyRef & { $type: $Type<'app.bsky.feed.post', 'replyRef'> } {
-  return is$typed(v, id, 'replyRef')
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
+}
+
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown) {
-  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
+export function isValidReplyRef<V>(v: V) {
+  return isValid<ReplyRef>(v, id, hashReplyRef)
 }
 
 /** Deprecated: use facets instead. */
 export interface Entity {
+  $type?: $Type<'app.bsky.feed.post', 'entity'>
   index: TextSlice
   /** Expected values are 'mention' and 'link'. */
   type: string
   value: string
-  [k: string]: unknown
 }
 
-export function isEntity(
-  v: unknown,
-): v is Entity & { $type: $Type<'app.bsky.feed.post', 'entity'> } {
-  return is$typed(v, id, 'entity')
+const hashEntity = 'entity'
+
+export function isEntity<V>(v: V) {
+  return is$typed(v, id, hashEntity)
+}
+
+export function validateEntity<V>(v: V) {
+  return validate<Entity & V>(v, id, hashEntity)
 }
 
-export function validateEntity(v: unknown) {
-  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
+export function isValidEntity<V>(v: V) {
+  return isValid<Entity>(v, id, hashEntity)
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
 export interface TextSlice {
+  $type?: $Type<'app.bsky.feed.post', 'textSlice'>
   start: number
   end: number
-  [k: string]: unknown
 }
 
-export function isTextSlice(
-  v: unknown,
-): v is TextSlice & { $type: $Type<'app.bsky.feed.post', 'textSlice'> } {
-  return is$typed(v, id, 'textSlice')
+const hashTextSlice = 'textSlice'
+
+export function isTextSlice<V>(v: V) {
+  return is$typed(v, id, hashTextSlice)
+}
+
+export function validateTextSlice<V>(v: V) {
+  return validate<TextSlice & V>(v, id, hashTextSlice)
 }
 
-export function validateTextSlice(v: unknown) {
-  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
+export function isValidTextSlice<V>(v: V) {
+  return isValid<TextSlice>(v, id, hashTextSlice)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
index 87273460b40..25e9d32ff8c 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -3,47 +3,57 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.postgate'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.postgate', 'main'>
   createdAt: string
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
-  embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
+  embeddingRules?: ($Typed<DisableRule> | { $type: string })[]
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.postgate', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 /** Disables embedding of this post. */
 export interface DisableRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.postgate', 'disableRule'>
+}
+
+const hashDisableRule = 'disableRule'
+
+export function isDisableRule<V>(v: V) {
+  return is$typed(v, id, hashDisableRule)
 }
 
-export function isDisableRule(
-  v: unknown,
-): v is DisableRule & {
-  $type: $Type<'app.bsky.feed.postgate', 'disableRule'>
-} {
-  return is$typed(v, id, 'disableRule')
+export function validateDisableRule<V>(v: V) {
+  return validate<DisableRule & V>(v, id, hashDisableRule)
 }
 
-export function validateDisableRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#disableRule`,
-    v,
-  ) as ValidationResult<DisableRule>
+export function isValidDisableRule<V>(v: V) {
+  return isValid<DisableRule>(v, id, hashDisableRule)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
index 0f1101898d5..f51561588c7 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.repost'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.repost', 'main'>
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.repost', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 50152c309ae..cf9e9fb5d2f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.searchPosts'
 
 export interface QueryParams {
@@ -44,7 +50,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index 59bc2c698b8..13fd5759447 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -4,23 +4,26 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.sendInteractions'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   interactions: AppBskyFeedDefs.Interaction[]
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
index 696de59da87..eefa35a8dab 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -3,19 +3,26 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.threadgate', 'main'>
   /** Reference (AT-URI) to the post record. */
   post: string
   allow?: (
-    | MentionRule
-    | FollowingRule
-    | ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MentionRule>
+    | $Typed<FollowingRule>
+    | $Typed<ListRule>
+    | { $type: string }
   )[]
   createdAt: string
   /** List of hidden reply URIs. */
@@ -23,68 +30,74 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.threadgate', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 /** Allow replies from actors mentioned in your post. */
 export interface MentionRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
 }
 
-export function isMentionRule(
-  v: unknown,
-): v is MentionRule & {
-  $type: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
-} {
-  return is$typed(v, id, 'mentionRule')
+const hashMentionRule = 'mentionRule'
+
+export function isMentionRule<V>(v: V) {
+  return is$typed(v, id, hashMentionRule)
+}
+
+export function validateMentionRule<V>(v: V) {
+  return validate<MentionRule & V>(v, id, hashMentionRule)
 }
 
-export function validateMentionRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#mentionRule`,
-    v,
-  ) as ValidationResult<MentionRule>
+export function isValidMentionRule<V>(v: V) {
+  return isValid<MentionRule>(v, id, hashMentionRule)
 }
 
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.threadgate', 'followingRule'>
 }
 
-export function isFollowingRule(
-  v: unknown,
-): v is FollowingRule & {
-  $type: $Type<'app.bsky.feed.threadgate', 'followingRule'>
-} {
-  return is$typed(v, id, 'followingRule')
+const hashFollowingRule = 'followingRule'
+
+export function isFollowingRule<V>(v: V) {
+  return is$typed(v, id, hashFollowingRule)
+}
+
+export function validateFollowingRule<V>(v: V) {
+  return validate<FollowingRule & V>(v, id, hashFollowingRule)
 }
 
-export function validateFollowingRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#followingRule`,
-    v,
-  ) as ValidationResult<FollowingRule>
+export function isValidFollowingRule<V>(v: V) {
+  return isValid<FollowingRule>(v, id, hashFollowingRule)
 }
 
 /** Allow replies from actors on a list. */
 export interface ListRule {
+  $type?: $Type<'app.bsky.feed.threadgate', 'listRule'>
   list: string
-  [k: string]: unknown
 }
 
-export function isListRule(
-  v: unknown,
-): v is ListRule & { $type: $Type<'app.bsky.feed.threadgate', 'listRule'> } {
-  return is$typed(v, id, 'listRule')
+const hashListRule = 'listRule'
+
+export function isListRule<V>(v: V) {
+  return is$typed(v, id, hashListRule)
+}
+
+export function validateListRule<V>(v: V) {
+  return validate<ListRule & V>(v, id, hashListRule)
 }
 
-export function validateListRule(v: unknown) {
-  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
+export function isValidListRule<V>(v: V) {
+  return isValid<ListRule>(v, id, hashListRule)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
index 167afdf2f9b..c10702a4403 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.block'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.block', 'main'>
   /** DID of the account to be blocked. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.block', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
index 44d1962de5e..52c8471a7d8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
@@ -3,16 +3,23 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyFeedDefs from '../feed/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyFeedDefs from '../feed/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.defs'
 
 export interface ListViewBasic {
+  $type?: $Type<'app.bsky.graph.defs', 'listViewBasic'>
   uri: string
   cid: string
   name: string
@@ -22,25 +29,24 @@ export interface ListViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt?: string
-  [k: string]: unknown
 }
 
-export function isListViewBasic(
-  v: unknown,
-): v is ListViewBasic & {
-  $type: $Type<'app.bsky.graph.defs', 'listViewBasic'>
-} {
-  return is$typed(v, id, 'listViewBasic')
+const hashListViewBasic = 'listViewBasic'
+
+export function isListViewBasic<V>(v: V) {
+  return is$typed(v, id, hashListViewBasic)
+}
+
+export function validateListViewBasic<V>(v: V) {
+  return validate<ListViewBasic & V>(v, id, hashListViewBasic)
 }
 
-export function validateListViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#listViewBasic`,
-    v,
-  ) as ValidationResult<ListViewBasic>
+export function isValidListViewBasic<V>(v: V) {
+  return isValid<ListViewBasic>(v, id, hashListViewBasic)
 }
 
 export interface ListView {
+  $type?: $Type<'app.bsky.graph.defs', 'listView'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -53,42 +59,47 @@ export interface ListView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isListView(
-  v: unknown,
-): v is ListView & { $type: $Type<'app.bsky.graph.defs', 'listView'> } {
-  return is$typed(v, id, 'listView')
+const hashListView = 'listView'
+
+export function isListView<V>(v: V) {
+  return is$typed(v, id, hashListView)
+}
+
+export function validateListView<V>(v: V) {
+  return validate<ListView & V>(v, id, hashListView)
 }
 
-export function validateListView(v: unknown) {
-  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
+export function isValidListView<V>(v: V) {
+  return isValid<ListView>(v, id, hashListView)
 }
 
 export interface ListItemView {
+  $type?: $Type<'app.bsky.graph.defs', 'listItemView'>
   uri: string
   subject: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isListItemView(
-  v: unknown,
-): v is ListItemView & { $type: $Type<'app.bsky.graph.defs', 'listItemView'> } {
-  return is$typed(v, id, 'listItemView')
+const hashListItemView = 'listItemView'
+
+export function isListItemView<V>(v: V) {
+  return is$typed(v, id, hashListItemView)
+}
+
+export function validateListItemView<V>(v: V) {
+  return validate<ListItemView & V>(v, id, hashListItemView)
 }
 
-export function validateListItemView(v: unknown) {
-  return lexicons.validate(
-    `${id}#listItemView`,
-    v,
-  ) as ValidationResult<ListItemView>
+export function isValidListItemView<V>(v: V) {
+  return isValid<ListItemView>(v, id, hashListItemView)
 }
 
 export interface StarterPackView {
+  $type?: $Type<'app.bsky.graph.defs', 'starterPackView'>
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   list?: ListViewBasic
   listItemsSample?: ListItemView[]
@@ -97,50 +108,47 @@ export interface StarterPackView {
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackView(
-  v: unknown,
-): v is StarterPackView & {
-  $type: $Type<'app.bsky.graph.defs', 'starterPackView'>
-} {
-  return is$typed(v, id, 'starterPackView')
+const hashStarterPackView = 'starterPackView'
+
+export function isStarterPackView<V>(v: V) {
+  return is$typed(v, id, hashStarterPackView)
+}
+
+export function validateStarterPackView<V>(v: V) {
+  return validate<StarterPackView & V>(v, id, hashStarterPackView)
 }
 
-export function validateStarterPackView(v: unknown) {
-  return lexicons.validate(
-    `${id}#starterPackView`,
-    v,
-  ) as ValidationResult<StarterPackView>
+export function isValidStarterPackView<V>(v: V) {
+  return isValid<StarterPackView>(v, id, hashStarterPackView)
 }
 
 export interface StarterPackViewBasic {
+  $type?: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   listItemCount?: number
   joinedWeekCount?: number
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(
-  v: unknown,
-): v is StarterPackViewBasic & {
-  $type: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
-} {
-  return is$typed(v, id, 'starterPackViewBasic')
+const hashStarterPackViewBasic = 'starterPackViewBasic'
+
+export function isStarterPackViewBasic<V>(v: V) {
+  return is$typed(v, id, hashStarterPackViewBasic)
+}
+
+export function validateStarterPackViewBasic<V>(v: V) {
+  return validate<StarterPackViewBasic & V>(v, id, hashStarterPackViewBasic)
 }
 
-export function validateStarterPackViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#starterPackViewBasic`,
-    v,
-  ) as ValidationResult<StarterPackViewBasic>
+export function isValidStarterPackViewBasic<V>(v: V) {
+  return isValid<StarterPackViewBasic>(v, id, hashStarterPackViewBasic)
 }
 
 export type ListPurpose =
@@ -157,67 +165,66 @@ export const CURATELIST = `${id}#curatelist`
 export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
+  $type?: $Type<'app.bsky.graph.defs', 'listViewerState'>
   muted?: boolean
   blocked?: string
-  [k: string]: unknown
 }
 
-export function isListViewerState(
-  v: unknown,
-): v is ListViewerState & {
-  $type: $Type<'app.bsky.graph.defs', 'listViewerState'>
-} {
-  return is$typed(v, id, 'listViewerState')
+const hashListViewerState = 'listViewerState'
+
+export function isListViewerState<V>(v: V) {
+  return is$typed(v, id, hashListViewerState)
+}
+
+export function validateListViewerState<V>(v: V) {
+  return validate<ListViewerState & V>(v, id, hashListViewerState)
 }
 
-export function validateListViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#listViewerState`,
-    v,
-  ) as ValidationResult<ListViewerState>
+export function isValidListViewerState<V>(v: V) {
+  return isValid<ListViewerState>(v, id, hashListViewerState)
 }
 
 /** indicates that a handle or DID could not be resolved */
 export interface NotFoundActor {
+  $type?: $Type<'app.bsky.graph.defs', 'notFoundActor'>
   actor: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundActor(
-  v: unknown,
-): v is NotFoundActor & {
-  $type: $Type<'app.bsky.graph.defs', 'notFoundActor'>
-} {
-  return is$typed(v, id, 'notFoundActor')
+const hashNotFoundActor = 'notFoundActor'
+
+export function isNotFoundActor<V>(v: V) {
+  return is$typed(v, id, hashNotFoundActor)
+}
+
+export function validateNotFoundActor<V>(v: V) {
+  return validate<NotFoundActor & V>(v, id, hashNotFoundActor)
 }
 
-export function validateNotFoundActor(v: unknown) {
-  return lexicons.validate(
-    `${id}#notFoundActor`,
-    v,
-  ) as ValidationResult<NotFoundActor>
+export function isValidNotFoundActor<V>(v: V) {
+  return isValid<NotFoundActor>(v, id, hashNotFoundActor)
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
 export interface Relationship {
+  $type?: $Type<'app.bsky.graph.defs', 'relationship'>
   did: string
   /** if the actor follows this DID, this is the AT-URI of the follow record */
   following?: string
   /** if the actor is followed by this DID, contains the AT-URI of the follow record */
   followedBy?: string
-  [k: string]: unknown
 }
 
-export function isRelationship(
-  v: unknown,
-): v is Relationship & { $type: $Type<'app.bsky.graph.defs', 'relationship'> } {
-  return is$typed(v, id, 'relationship')
+const hashRelationship = 'relationship'
+
+export function isRelationship<V>(v: V) {
+  return is$typed(v, id, hashRelationship)
+}
+
+export function validateRelationship<V>(v: V) {
+  return validate<Relationship & V>(v, id, hashRelationship)
 }
 
-export function validateRelationship(v: unknown) {
-  return lexicons.validate(
-    `${id}#relationship`,
-    v,
-  ) as ValidationResult<Relationship>
+export function isValidRelationship<V>(v: V) {
+  return isValid<Relationship>(v, id, hashRelationship)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
index bb0f2d2dc3a..28c81906d31 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
@@ -3,23 +3,34 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.follow'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.follow', 'main'>
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.follow', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index ee9a8af4999..ba38795bf41 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getActorStarterPacks'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
index d353dc99267..5f4be16f2e8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getBlocks'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blocks: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
index a44fe4c7ca9..ea5db286f46 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getFollowers'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
index af3b8214783..c6455506ab7 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getFollows'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   follows: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index 0cdb01d99df..81669d4e12a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getKnownFollowers'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
index 444d463f7be..708ce31ce8e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getList'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export interface OutputSchema {
   cursor?: string
   list: AppBskyGraphDefs.ListView
   items: AppBskyGraphDefs.ListItemView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 2828969d77c..a754c83658f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getListBlocks'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 25fc22a45e7..e4f376d20cf 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getListMutes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
index 04c1e929899..e28505a47dd 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getLists'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
index fcfbadd3154..9b0d6c83b3b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getMutes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   mutes: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
index b169bc9de7e..e05732c84ad 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getRelationships'
 
 export interface QueryParams {
@@ -23,11 +29,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   actor?: string
   relationships: (
-    | AppBskyGraphDefs.Relationship
-    | AppBskyGraphDefs.NotFoundActor
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyGraphDefs.Relationship>
+    | $Typed<AppBskyGraphDefs.NotFoundActor>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index 906e412e1c5..69a882c3852 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getStarterPack'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPack: AppBskyGraphDefs.StarterPackView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 829cfa6bc94..bb7cfafe4c5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getStarterPacks'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index 7a59fd5716d..e5f1148f4f5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getSuggestedFollowsByActor'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export interface OutputSchema {
   suggestions: AppBskyActorDefs.ProfileView[]
   /** If true, response has fallen-back to generic results, and is not scoped using relativeToDid */
   isFallback?: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
index 4fc99ad59d4..97bf1c00559 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
@@ -3,34 +3,43 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyGraphDefs from './defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.list'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.list', 'main'>
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
   name: string
   description?: string
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.list', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
index e159ed9b6d1..6ebd36c4cb3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.listblock'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.listblock', 'main'>
   /** Reference (AT-URI) to the mod list record. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.listblock', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
index 164196cfc25..a3b7efb0eb1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.listitem'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.listitem', 'main'>
   /** The account which is included on the list. */
   subject: string
   /** Reference (AT-URI) to the list record (app.bsky.graph.list). */
@@ -17,12 +24,16 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.listitem', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
index aa9b7a1b950..7136480f8f3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteActor'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 0acc1da0dc2..30dabadfd2f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteActorList'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
index 552bff9572f..efb5dab9617 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteThread'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index 643bb579fe1..e7be70760c7 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.searchStarterPacks'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
index d7cb5b48930..66abf07fd50 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../richtext/facet'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.starterpack'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.starterpack', 'main'>
   /** Display name for starter pack; can not be empty. */
   name: string
   description?: string
@@ -21,27 +28,35 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.starterpack', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 export interface FeedItem {
+  $type?: $Type<'app.bsky.graph.starterpack', 'feedItem'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeedItem(
-  v: unknown,
-): v is FeedItem & { $type: $Type<'app.bsky.graph.starterpack', 'feedItem'> } {
-  return is$typed(v, id, 'feedItem')
+const hashFeedItem = 'feedItem'
+
+export function isFeedItem<V>(v: V) {
+  return is$typed(v, id, hashFeedItem)
+}
+
+export function validateFeedItem<V>(v: V) {
+  return validate<FeedItem & V>(v, id, hashFeedItem)
 }
 
-export function validateFeedItem(v: unknown) {
-  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
+export function isValidFeedItem<V>(v: V) {
+  return isValid<FeedItem>(v, id, hashFeedItem)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index 74e02903ed7..21396a46451 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteActor'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 44fc69490f8..f25697e65ea 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteActorList'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 135db7e8e4f..d657979501c 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteThread'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
index b59c8227d10..e0f2f945b4e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.defs'
 
 export interface LabelerView {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerView'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -18,23 +25,24 @@ export interface LabelerView {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerView(
-  v: unknown,
-): v is LabelerView & { $type: $Type<'app.bsky.labeler.defs', 'labelerView'> } {
-  return is$typed(v, id, 'labelerView')
+const hashLabelerView = 'labelerView'
+
+export function isLabelerView<V>(v: V) {
+  return is$typed(v, id, hashLabelerView)
+}
+
+export function validateLabelerView<V>(v: V) {
+  return validate<LabelerView & V>(v, id, hashLabelerView)
 }
 
-export function validateLabelerView(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerView`,
-    v,
-  ) as ValidationResult<LabelerView>
+export function isValidLabelerView<V>(v: V) {
+  return isValid<LabelerView>(v, id, hashLabelerView)
 }
 
 export interface LabelerViewDetailed {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -43,63 +51,59 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(
-  v: unknown,
-): v is LabelerViewDetailed & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
-} {
-  return is$typed(v, id, 'labelerViewDetailed')
+const hashLabelerViewDetailed = 'labelerViewDetailed'
+
+export function isLabelerViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewDetailed)
+}
+
+export function validateLabelerViewDetailed<V>(v: V) {
+  return validate<LabelerViewDetailed & V>(v, id, hashLabelerViewDetailed)
 }
 
-export function validateLabelerViewDetailed(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerViewDetailed`,
-    v,
-  ) as ValidationResult<LabelerViewDetailed>
+export function isValidLabelerViewDetailed<V>(v: V) {
+  return isValid<LabelerViewDetailed>(v, id, hashLabelerViewDetailed)
 }
 
 export interface LabelerViewerState {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
   like?: string
-  [k: string]: unknown
 }
 
-export function isLabelerViewerState(
-  v: unknown,
-): v is LabelerViewerState & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
-} {
-  return is$typed(v, id, 'labelerViewerState')
+const hashLabelerViewerState = 'labelerViewerState'
+
+export function isLabelerViewerState<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewerState)
+}
+
+export function validateLabelerViewerState<V>(v: V) {
+  return validate<LabelerViewerState & V>(v, id, hashLabelerViewerState)
 }
 
-export function validateLabelerViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerViewerState`,
-    v,
-  ) as ValidationResult<LabelerViewerState>
+export function isValidLabelerViewerState<V>(v: V) {
+  return isValid<LabelerViewerState>(v, id, hashLabelerViewerState)
 }
 
 export interface LabelerPolicies {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
   /** The label values which this labeler publishes. May include global or custom labels. */
   labelValues: ComAtprotoLabelDefs.LabelValue[]
   /** Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. */
   labelValueDefinitions?: ComAtprotoLabelDefs.LabelValueDefinition[]
-  [k: string]: unknown
 }
 
-export function isLabelerPolicies(
-  v: unknown,
-): v is LabelerPolicies & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
-} {
-  return is$typed(v, id, 'labelerPolicies')
+const hashLabelerPolicies = 'labelerPolicies'
+
+export function isLabelerPolicies<V>(v: V) {
+  return is$typed(v, id, hashLabelerPolicies)
+}
+
+export function validateLabelerPolicies<V>(v: V) {
+  return validate<LabelerPolicies & V>(v, id, hashLabelerPolicies)
 }
 
-export function validateLabelerPolicies(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerPolicies`,
-    v,
-  ) as ValidationResult<LabelerPolicies>
+export function isValidLabelerPolicies<V>(v: V) {
+  return isValid<LabelerPolicies>(v, id, hashLabelerPolicies)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
index c80da11262f..ec8efbba356 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyLabelerDefs from './defs'
+import type * as AppBskyLabelerDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.getServices'
 
 export interface QueryParams {
@@ -20,11 +26,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   views: (
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyLabelerDefs.LabelerViewDetailed>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
index 0abc40dc8d1..5973c2fd285 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
@@ -3,28 +3,37 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyLabelerDefs from './defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.service'
 
 export interface Record {
+  $type?: $Type<'app.bsky.labeler.service', 'main'>
   policies: AppBskyLabelerDefs.LabelerPolicies
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.labeler.service', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index d52044a760b..658b44090a5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.getUnreadCount'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   count: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 19a2dc35fb0..69e705fcf3c 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -4,12 +4,18 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.listNotifications'
 
 export interface QueryParams {
@@ -28,7 +34,6 @@ export interface OutputSchema {
   notifications: Notification[]
   priority?: boolean
   seenAt?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -57,6 +62,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Notification {
+  $type?: $Type<'app.bsky.notification.listNotifications', 'notification'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileView
@@ -71,24 +77,22 @@ export interface Notification {
     | 'starterpack-joined'
     | (string & {})
   reasonSubject?: string
-  record: {}
+  record: { [_ in string]: unknown }
   isRead: boolean
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isNotification(
-  v: unknown,
-): v is Notification & {
-  $type: $Type<'app.bsky.notification.listNotifications', 'notification'>
-} {
-  return is$typed(v, id, 'notification')
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
+}
+
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
 }
 
-export function validateNotification(v: unknown) {
-  return lexicons.validate(
-    `${id}#notification`,
-    v,
-  ) as ValidationResult<Notification>
+export function isValidNotification<V>(v: V) {
+  return isValid<Notification>(v, id, hashNotification)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 0b5a9f066ad..f741da70ab3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   priority: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
index 516babda578..8fe65463fed 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.registerPush'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   token: string
   platform: 'ios' | 'android' | 'web' | (string & {})
   appId: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 6312ceeaa15..7e374302fdd 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.updateSeen'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   seenAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts b/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
index 0a14274b608..a73bef3f85a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -3,89 +3,115 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
+  $type?: $Type<'app.bsky.richtext.facet', 'main'>
   index: ByteSlice
-  features: (Mention | Link | Tag | { $type: string; [k: string]: unknown })[]
-  [k: string]: unknown
+  features: ($Typed<Mention> | $Typed<Link> | $Typed<Tag> | { $type: string })[]
+}
+
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.richtext.facet', 'main'> } {
-  return is$typed(v, id, 'main')
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
 export interface Mention {
+  $type?: $Type<'app.bsky.richtext.facet', 'mention'>
   did: string
-  [k: string]: unknown
 }
 
-export function isMention(
-  v: unknown,
-): v is Mention & { $type: $Type<'app.bsky.richtext.facet', 'mention'> } {
-  return is$typed(v, id, 'mention')
+const hashMention = 'mention'
+
+export function isMention<V>(v: V) {
+  return is$typed(v, id, hashMention)
+}
+
+export function validateMention<V>(v: V) {
+  return validate<Mention & V>(v, id, hashMention)
 }
 
-export function validateMention(v: unknown) {
-  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
+export function isValidMention<V>(v: V) {
+  return isValid<Mention>(v, id, hashMention)
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
 export interface Link {
+  $type?: $Type<'app.bsky.richtext.facet', 'link'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isLink(
-  v: unknown,
-): v is Link & { $type: $Type<'app.bsky.richtext.facet', 'link'> } {
-  return is$typed(v, id, 'link')
+const hashLink = 'link'
+
+export function isLink<V>(v: V) {
+  return is$typed(v, id, hashLink)
+}
+
+export function validateLink<V>(v: V) {
+  return validate<Link & V>(v, id, hashLink)
 }
 
-export function validateLink(v: unknown) {
-  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
+export function isValidLink<V>(v: V) {
+  return isValid<Link>(v, id, hashLink)
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
 export interface Tag {
+  $type?: $Type<'app.bsky.richtext.facet', 'tag'>
   tag: string
-  [k: string]: unknown
 }
 
-export function isTag(
-  v: unknown,
-): v is Tag & { $type: $Type<'app.bsky.richtext.facet', 'tag'> } {
-  return is$typed(v, id, 'tag')
+const hashTag = 'tag'
+
+export function isTag<V>(v: V) {
+  return is$typed(v, id, hashTag)
+}
+
+export function validateTag<V>(v: V) {
+  return validate<Tag & V>(v, id, hashTag)
 }
 
-export function validateTag(v: unknown) {
-  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
+export function isValidTag<V>(v: V) {
+  return isValid<Tag>(v, id, hashTag)
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
 export interface ByteSlice {
+  $type?: $Type<'app.bsky.richtext.facet', 'byteSlice'>
   byteStart: number
   byteEnd: number
-  [k: string]: unknown
 }
 
-export function isByteSlice(
-  v: unknown,
-): v is ByteSlice & { $type: $Type<'app.bsky.richtext.facet', 'byteSlice'> } {
-  return is$typed(v, id, 'byteSlice')
+const hashByteSlice = 'byteSlice'
+
+export function isByteSlice<V>(v: V) {
+  return is$typed(v, id, hashByteSlice)
+}
+
+export function validateByteSlice<V>(v: V) {
+  return validate<ByteSlice & V>(v, id, hashByteSlice)
 }
 
-export function validateByteSlice(v: unknown) {
-  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
+export function isValidByteSlice<V>(v: V) {
+  return isValid<ByteSlice>(v, id, hashByteSlice)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
index 415c1c30867..a4286c5222e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -3,90 +3,100 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(
-  v: unknown,
-): v is SkeletonSearchPost & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
-} {
-  return is$typed(v, id, 'skeletonSearchPost')
+const hashSkeletonSearchPost = 'skeletonSearchPost'
+
+export function isSkeletonSearchPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchPost)
 }
 
-export function validateSkeletonSearchPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchPost`,
-    v,
-  ) as ValidationResult<SkeletonSearchPost>
+export function validateSkeletonSearchPost<V>(v: V) {
+  return validate<SkeletonSearchPost & V>(v, id, hashSkeletonSearchPost)
+}
+
+export function isValidSkeletonSearchPost<V>(v: V) {
+  return isValid<SkeletonSearchPost>(v, id, hashSkeletonSearchPost)
 }
 
 export interface SkeletonSearchActor {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
   did: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(
-  v: unknown,
-): v is SkeletonSearchActor & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
-} {
-  return is$typed(v, id, 'skeletonSearchActor')
+const hashSkeletonSearchActor = 'skeletonSearchActor'
+
+export function isSkeletonSearchActor<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchActor)
 }
 
-export function validateSkeletonSearchActor(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchActor`,
-    v,
-  ) as ValidationResult<SkeletonSearchActor>
+export function validateSkeletonSearchActor<V>(v: V) {
+  return validate<SkeletonSearchActor & V>(v, id, hashSkeletonSearchActor)
+}
+
+export function isValidSkeletonSearchActor<V>(v: V) {
+  return isValid<SkeletonSearchActor>(v, id, hashSkeletonSearchActor)
 }
 
 export interface SkeletonSearchStarterPack {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchStarterPack(
-  v: unknown,
-): v is SkeletonSearchStarterPack & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
-} {
-  return is$typed(v, id, 'skeletonSearchStarterPack')
+const hashSkeletonSearchStarterPack = 'skeletonSearchStarterPack'
+
+export function isSkeletonSearchStarterPack<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchStarterPack)
+}
+
+export function validateSkeletonSearchStarterPack<V>(v: V) {
+  return validate<SkeletonSearchStarterPack & V>(
+    v,
+    id,
+    hashSkeletonSearchStarterPack,
+  )
 }
 
-export function validateSkeletonSearchStarterPack(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchStarterPack`,
+export function isValidSkeletonSearchStarterPack<V>(v: V) {
+  return isValid<SkeletonSearchStarterPack>(
     v,
-  ) as ValidationResult<SkeletonSearchStarterPack>
+    id,
+    hashSkeletonSearchStarterPack,
+  )
 }
 
 export interface TrendingTopic {
+  $type?: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
   topic: string
   displayName?: string
   description?: string
   link: string
-  [k: string]: unknown
 }
 
-export function isTrendingTopic(
-  v: unknown,
-): v is TrendingTopic & {
-  $type: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
-} {
-  return is$typed(v, id, 'trendingTopic')
+const hashTrendingTopic = 'trendingTopic'
+
+export function isTrendingTopic<V>(v: V) {
+  return is$typed(v, id, hashTrendingTopic)
 }
 
-export function validateTrendingTopic(v: unknown) {
-  return lexicons.validate(
-    `${id}#trendingTopic`,
-    v,
-  ) as ValidationResult<TrendingTopic>
+export function validateTrendingTopic<V>(v: V) {
+  return validate<TrendingTopic & V>(v, id, hashTrendingTopic)
+}
+
+export function isValidTrendingTopic<V>(v: V) {
+  return isValid<TrendingTopic>(v, id, hashTrendingTopic)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index b9e45fd96ce..ee024aff1b5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getConfig'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   checkEmailConfirmed?: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 20a45bc5992..d2abd861e22 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from '../feed/defs'
+import type * as AppBskyFeedDefs from '../feed/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getPopularFeedGenerators'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index 579973036a5..6a58219d23f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
   /** DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer. */
   relativeToDid?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index 371350940f3..d5afe19e3bb 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getTaggedSuggestions'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   suggestions: Suggestion[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -45,23 +50,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Suggestion {
+  $type?: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
   tag: string
   subjectType: 'actor' | 'feed' | (string & {})
   subject: string
-  [k: string]: unknown
 }
 
-export function isSuggestion(
-  v: unknown,
-): v is Suggestion & {
-  $type: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
-} {
-  return is$typed(v, id, 'suggestion')
+const hashSuggestion = 'suggestion'
+
+export function isSuggestion<V>(v: V) {
+  return is$typed(v, id, hashSuggestion)
+}
+
+export function validateSuggestion<V>(v: V) {
+  return validate<Suggestion & V>(v, id, hashSuggestion)
 }
 
-export function validateSuggestion(v: unknown) {
-  return lexicons.validate(
-    `${id}#suggestion`,
-    v,
-  ) as ValidationResult<Suggestion>
+export function isValidSuggestion<V>(v: V) {
+  return isValid<Suggestion>(v, id, hashSuggestion)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 47a4ac1a5b0..c1eb890b669 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getTrendingTopics'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   topics: AppBskyUnspeccedDefs.TrendingTopic[]
   suggested: AppBskyUnspeccedDefs.TrendingTopic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index b4206a089b9..a9c27fbef04 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchActorsSkeleton'
 
 export interface QueryParams {
@@ -30,7 +36,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index 16b2ff87428..9f5cd4aed0f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchPostsSkeleton'
 
 export interface QueryParams {
@@ -46,7 +52,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyUnspeccedDefs.SkeletonSearchPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index 6927713a2e4..db8a5a27aef 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
 
 export interface QueryParams {
@@ -28,7 +34,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   starterPacks: AppBskyUnspeccedDefs.SkeletonSearchStarterPack[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
index 7b82931c46c..93ed16829ca 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
+  $type?: $Type<'app.bsky.video.defs', 'jobStatus'>
   jobId: string
   did: string
   /** The state of the video processing job. All values not listed as a known value indicate that the job is in process. */
@@ -18,15 +25,18 @@ export interface JobStatus {
   blob?: BlobRef
   error?: string
   message?: string
-  [k: string]: unknown
 }
 
-export function isJobStatus(
-  v: unknown,
-): v is JobStatus & { $type: $Type<'app.bsky.video.defs', 'jobStatus'> } {
-  return is$typed(v, id, 'jobStatus')
+const hashJobStatus = 'jobStatus'
+
+export function isJobStatus<V>(v: V) {
+  return is$typed(v, id, hashJobStatus)
+}
+
+export function validateJobStatus<V>(v: V) {
+  return validate<JobStatus & V>(v, id, hashJobStatus)
 }
 
-export function validateJobStatus(v: unknown) {
-  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
+export function isValidJobStatus<V>(v: V) {
+  return isValid<JobStatus>(v, id, hashJobStatus)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 6cea4453ace..71786a6b24d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.getJobStatus'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index e1a2c8a12f8..474a2917384 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.getUploadLimits'
 
 export interface QueryParams {}
@@ -20,7 +26,6 @@ export interface OutputSchema {
   remainingDailyBytes?: number
   message?: string
   error?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
index 85e0beeb811..da8834bc9cd 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -5,11 +5,17 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.uploadVideo'
 
 export interface QueryParams {}
@@ -18,7 +24,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
index 454bd9edf6f..745d97fc50a 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -3,22 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
+  $type?: $Type<'chat.bsky.actor.declaration', 'main'>
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'chat.bsky.actor.declaration', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
index 3b1627f0800..0a12bbedea1 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
   did: string
   handle: string
   displayName?: string
@@ -20,20 +27,18 @@ export interface ProfileViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   /** Set to true when the actor cannot actively participate in converations */
   chatDisabled?: boolean
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(
-  v: unknown,
-): v is ProfileViewBasic & {
-  $type: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
-} {
-  return is$typed(v, id, 'profileViewBasic')
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
+}
+
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewBasic`,
-    v,
-  ) as ValidationResult<ProfileViewBasic>
+export function isValidProfileViewBasic<V>(v: V) {
+  return isValid<ProfileViewBasic>(v, id, hashProfileViewBasic)
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index c45ee77d22e..8de7d41b2cd 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -4,19 +4,23 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.deleteAccount'
 
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export type HandlerInput = undefined
 
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index aa37fb7e366..6768e9f518b 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.exportAccountData'
 
 export interface QueryParams {}
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
index f7adb51d238..1b1a357aabc 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -3,237 +3,236 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
-import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
-import * as ChatBskyActorDefs from '../actor/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
+import type * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
+import type * as ChatBskyActorDefs from '../actor/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.defs'
 
 export interface MessageRef {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageRef'>
   did: string
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
-export function isMessageRef(
-  v: unknown,
-): v is MessageRef & { $type: $Type<'chat.bsky.convo.defs', 'messageRef'> } {
-  return is$typed(v, id, 'messageRef')
+const hashMessageRef = 'messageRef'
+
+export function isMessageRef<V>(v: V) {
+  return is$typed(v, id, hashMessageRef)
 }
 
-export function validateMessageRef(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageRef`,
-    v,
-  ) as ValidationResult<MessageRef>
+export function validateMessageRef<V>(v: V) {
+  return validate<MessageRef & V>(v, id, hashMessageRef)
+}
+
+export function isValidMessageRef<V>(v: V) {
+  return isValid<MessageRef>(v, id, hashMessageRef)
 }
 
 export interface MessageInput {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageInput'>
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.Main | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  embed?: $Typed<AppBskyEmbedRecord.Main> | { $type: string }
 }
 
-export function isMessageInput(
-  v: unknown,
-): v is MessageInput & {
-  $type: $Type<'chat.bsky.convo.defs', 'messageInput'>
-} {
-  return is$typed(v, id, 'messageInput')
+const hashMessageInput = 'messageInput'
+
+export function isMessageInput<V>(v: V) {
+  return is$typed(v, id, hashMessageInput)
 }
 
-export function validateMessageInput(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageInput`,
-    v,
-  ) as ValidationResult<MessageInput>
+export function validateMessageInput<V>(v: V) {
+  return validate<MessageInput & V>(v, id, hashMessageInput)
+}
+
+export function isValidMessageInput<V>(v: V) {
+  return isValid<MessageInput>(v, id, hashMessageInput)
 }
 
 export interface MessageView {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageView'>
   id: string
   rev: string
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.View | { $type: string; [k: string]: unknown }
+  embed?: $Typed<AppBskyEmbedRecord.View> | { $type: string }
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isMessageView(
-  v: unknown,
-): v is MessageView & { $type: $Type<'chat.bsky.convo.defs', 'messageView'> } {
-  return is$typed(v, id, 'messageView')
+const hashMessageView = 'messageView'
+
+export function isMessageView<V>(v: V) {
+  return is$typed(v, id, hashMessageView)
+}
+
+export function validateMessageView<V>(v: V) {
+  return validate<MessageView & V>(v, id, hashMessageView)
 }
 
-export function validateMessageView(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageView`,
-    v,
-  ) as ValidationResult<MessageView>
+export function isValidMessageView<V>(v: V) {
+  return isValid<MessageView>(v, id, hashMessageView)
 }
 
 export interface DeletedMessageView {
+  $type?: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
   id: string
   rev: string
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isDeletedMessageView(
-  v: unknown,
-): v is DeletedMessageView & {
-  $type: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
-} {
-  return is$typed(v, id, 'deletedMessageView')
+const hashDeletedMessageView = 'deletedMessageView'
+
+export function isDeletedMessageView<V>(v: V) {
+  return is$typed(v, id, hashDeletedMessageView)
 }
 
-export function validateDeletedMessageView(v: unknown) {
-  return lexicons.validate(
-    `${id}#deletedMessageView`,
-    v,
-  ) as ValidationResult<DeletedMessageView>
+export function validateDeletedMessageView<V>(v: V) {
+  return validate<DeletedMessageView & V>(v, id, hashDeletedMessageView)
+}
+
+export function isValidDeletedMessageView<V>(v: V) {
+  return isValid<DeletedMessageView>(v, id, hashDeletedMessageView)
 }
 
 export interface MessageViewSender {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
   did: string
-  [k: string]: unknown
 }
 
-export function isMessageViewSender(
-  v: unknown,
-): v is MessageViewSender & {
-  $type: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
-} {
-  return is$typed(v, id, 'messageViewSender')
+const hashMessageViewSender = 'messageViewSender'
+
+export function isMessageViewSender<V>(v: V) {
+  return is$typed(v, id, hashMessageViewSender)
 }
 
-export function validateMessageViewSender(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageViewSender`,
-    v,
-  ) as ValidationResult<MessageViewSender>
+export function validateMessageViewSender<V>(v: V) {
+  return validate<MessageViewSender & V>(v, id, hashMessageViewSender)
+}
+
+export function isValidMessageViewSender<V>(v: V) {
+  return isValid<MessageViewSender>(v, id, hashMessageViewSender)
 }
 
 export interface ConvoView {
+  $type?: $Type<'chat.bsky.convo.defs', 'convoView'>
   id: string
   rev: string
   members: ChatBskyActorDefs.ProfileViewBasic[]
   lastMessage?:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MessageView>
+    | $Typed<DeletedMessageView>
+    | { $type: string }
   muted: boolean
   opened?: boolean
   unreadCount: number
-  [k: string]: unknown
 }
 
-export function isConvoView(
-  v: unknown,
-): v is ConvoView & { $type: $Type<'chat.bsky.convo.defs', 'convoView'> } {
-  return is$typed(v, id, 'convoView')
+const hashConvoView = 'convoView'
+
+export function isConvoView<V>(v: V) {
+  return is$typed(v, id, hashConvoView)
 }
 
-export function validateConvoView(v: unknown) {
-  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
+export function validateConvoView<V>(v: V) {
+  return validate<ConvoView & V>(v, id, hashConvoView)
+}
+
+export function isValidConvoView<V>(v: V) {
+  return isValid<ConvoView>(v, id, hashConvoView)
 }
 
 export interface LogBeginConvo {
+  $type?: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogBeginConvo(
-  v: unknown,
-): v is LogBeginConvo & {
-  $type: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
-} {
-  return is$typed(v, id, 'logBeginConvo')
+const hashLogBeginConvo = 'logBeginConvo'
+
+export function isLogBeginConvo<V>(v: V) {
+  return is$typed(v, id, hashLogBeginConvo)
 }
 
-export function validateLogBeginConvo(v: unknown) {
-  return lexicons.validate(
-    `${id}#logBeginConvo`,
-    v,
-  ) as ValidationResult<LogBeginConvo>
+export function validateLogBeginConvo<V>(v: V) {
+  return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
+}
+
+export function isValidLogBeginConvo<V>(v: V) {
+  return isValid<LogBeginConvo>(v, id, hashLogBeginConvo)
 }
 
 export interface LogLeaveConvo {
+  $type?: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogLeaveConvo(
-  v: unknown,
-): v is LogLeaveConvo & {
-  $type: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
-} {
-  return is$typed(v, id, 'logLeaveConvo')
+const hashLogLeaveConvo = 'logLeaveConvo'
+
+export function isLogLeaveConvo<V>(v: V) {
+  return is$typed(v, id, hashLogLeaveConvo)
 }
 
-export function validateLogLeaveConvo(v: unknown) {
-  return lexicons.validate(
-    `${id}#logLeaveConvo`,
-    v,
-  ) as ValidationResult<LogLeaveConvo>
+export function validateLogLeaveConvo<V>(v: V) {
+  return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
+}
+
+export function isValidLogLeaveConvo<V>(v: V) {
+  return isValid<LogLeaveConvo>(v, id, hashLogLeaveConvo)
 }
 
 export interface LogCreateMessage {
+  $type?: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogCreateMessage(
-  v: unknown,
-): v is LogCreateMessage & {
-  $type: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
-} {
-  return is$typed(v, id, 'logCreateMessage')
+const hashLogCreateMessage = 'logCreateMessage'
+
+export function isLogCreateMessage<V>(v: V) {
+  return is$typed(v, id, hashLogCreateMessage)
 }
 
-export function validateLogCreateMessage(v: unknown) {
-  return lexicons.validate(
-    `${id}#logCreateMessage`,
-    v,
-  ) as ValidationResult<LogCreateMessage>
+export function validateLogCreateMessage<V>(v: V) {
+  return validate<LogCreateMessage & V>(v, id, hashLogCreateMessage)
+}
+
+export function isValidLogCreateMessage<V>(v: V) {
+  return isValid<LogCreateMessage>(v, id, hashLogCreateMessage)
 }
 
 export interface LogDeleteMessage {
+  $type?: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
-}
-
-export function isLogDeleteMessage(
-  v: unknown,
-): v is LogDeleteMessage & {
-  $type: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
-} {
-  return is$typed(v, id, 'logDeleteMessage')
-}
-
-export function validateLogDeleteMessage(v: unknown) {
-  return lexicons.validate(
-    `${id}#logDeleteMessage`,
-    v,
-  ) as ValidationResult<LogDeleteMessage>
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
+}
+
+const hashLogDeleteMessage = 'logDeleteMessage'
+
+export function isLogDeleteMessage<V>(v: V) {
+  return is$typed(v, id, hashLogDeleteMessage)
+}
+
+export function validateLogDeleteMessage<V>(v: V) {
+  return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
+}
+
+export function isValidLogDeleteMessage<V>(v: V) {
+  return isValid<LogDeleteMessage>(v, id, hashLogDeleteMessage)
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index 4364c075ecd..e12b2d43889 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.deleteMessageForSelf'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.DeletedMessageView
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
index 7563c777197..71014d1779b 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getConvo'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index d7a1a69bb13..29f60bfb9ae 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getConvoForMembers'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
index 47f28623631..743e74fd7d2 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getLog'
 
 export interface QueryParams {
@@ -20,13 +26,12 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   logs: (
-    | ChatBskyConvoDefs.LogBeginConvo
-    | ChatBskyConvoDefs.LogLeaveConvo
-    | ChatBskyConvoDefs.LogCreateMessage
-    | ChatBskyConvoDefs.LogDeleteMessage
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
+    | $Typed<ChatBskyConvoDefs.LogCreateMessage>
+    | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
index 68f9331fdef..f32d67836cf 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getMessages'
 
 export interface QueryParams {
@@ -22,11 +28,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 67a3e3a141c..2e221f8574c 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.leaveConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convoId: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 5829bd5b899..07e35ea50ae 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.listConvos'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   convos: ChatBskyConvoDefs.ConvoView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index c12e1df0238..a510f259225 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.muteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index 6ac463db74c..b0e65cacaaa 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.sendMessage'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.MessageView
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index 1e34fdc658f..d432ca6776a 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.sendMessageBatch'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   items: BatchItem[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   items: ChatBskyConvoDefs.MessageView[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -52,19 +56,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface BatchItem {
+  $type?: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
-export function isBatchItem(
-  v: unknown,
-): v is BatchItem & {
-  $type: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
-} {
-  return is$typed(v, id, 'batchItem')
+const hashBatchItem = 'batchItem'
+
+export function isBatchItem<V>(v: V) {
+  return is$typed(v, id, hashBatchItem)
+}
+
+export function validateBatchItem<V>(v: V) {
+  return validate<BatchItem & V>(v, id, hashBatchItem)
 }
 
-export function validateBatchItem(v: unknown) {
-  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
+export function isValidBatchItem<V>(v: V) {
+  return isValid<BatchItem>(v, id, hashBatchItem)
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index 03188d2bbd2..abf20d15e45 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.unmuteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
index 8b7440714c0..562def1ec75 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.updateRead'
 
 export interface QueryParams {}
@@ -16,12 +22,10 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   messageId?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index bee28aeadad..991b6abf085 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.getActorMetadata'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export interface OutputSchema {
   day: Metadata
   month: Metadata
   all: Metadata
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,21 +54,23 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Metadata {
+  $type?: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
   messagesSent: number
   messagesReceived: number
   convos: number
   convosStarted: number
-  [k: string]: unknown
 }
 
-export function isMetadata(
-  v: unknown,
-): v is Metadata & {
-  $type: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
-} {
-  return is$typed(v, id, 'metadata')
+const hashMetadata = 'metadata'
+
+export function isMetadata<V>(v: V) {
+  return is$typed(v, id, hashMetadata)
+}
+
+export function validateMetadata<V>(v: V) {
+  return validate<Metadata & V>(v, id, hashMetadata)
 }
 
-export function validateMetadata(v: unknown) {
-  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
+export function isValidMetadata<V>(v: V) {
+  return isValid<Metadata>(v, id, hashMetadata)
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index a24045586b0..6426d17b62c 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from '../convo/defs'
+import type * as ChatBskyConvoDefs from '../convo/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.getMessageContext'
 
 export interface QueryParams {
@@ -23,11 +29,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index 2493a8063be..4caae41a9dd 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.updateActorAccess'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   actor: string
   allowAccess: boolean
   ref?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
index bdda35afb96..83f247d978c 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
@@ -3,36 +3,44 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoServerDefs from '../server/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from '../server/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.defs'
 
 export interface StatusAttr {
+  $type?: $Type<'com.atproto.admin.defs', 'statusAttr'>
   applied: boolean
   ref?: string
-  [k: string]: unknown
 }
 
-export function isStatusAttr(
-  v: unknown,
-): v is StatusAttr & { $type: $Type<'com.atproto.admin.defs', 'statusAttr'> } {
-  return is$typed(v, id, 'statusAttr')
+const hashStatusAttr = 'statusAttr'
+
+export function isStatusAttr<V>(v: V) {
+  return is$typed(v, id, hashStatusAttr)
+}
+
+export function validateStatusAttr<V>(v: V) {
+  return validate<StatusAttr & V>(v, id, hashStatusAttr)
 }
 
-export function validateStatusAttr(v: unknown) {
-  return lexicons.validate(
-    `${id}#statusAttr`,
-    v,
-  ) as ValidationResult<StatusAttr>
+export function isValidStatusAttr<V>(v: V) {
+  return isValid<StatusAttr>(v, id, hashStatusAttr)
 }
 
 export interface AccountView {
+  $type?: $Type<'com.atproto.admin.defs', 'accountView'>
   did: string
   handle: string
   email?: string
-  relatedRecords?: {}[]
+  relatedRecords?: { [_ in string]: unknown }[]
   indexedAt: string
   invitedBy?: ComAtprotoServerDefs.InviteCode
   invites?: ComAtprotoServerDefs.InviteCode[]
@@ -41,78 +49,78 @@ export interface AccountView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isAccountView(
-  v: unknown,
-): v is AccountView & {
-  $type: $Type<'com.atproto.admin.defs', 'accountView'>
-} {
-  return is$typed(v, id, 'accountView')
+const hashAccountView = 'accountView'
+
+export function isAccountView<V>(v: V) {
+  return is$typed(v, id, hashAccountView)
+}
+
+export function validateAccountView<V>(v: V) {
+  return validate<AccountView & V>(v, id, hashAccountView)
 }
 
-export function validateAccountView(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountView`,
-    v,
-  ) as ValidationResult<AccountView>
+export function isValidAccountView<V>(v: V) {
+  return isValid<AccountView>(v, id, hashAccountView)
 }
 
 export interface RepoRef {
+  $type?: $Type<'com.atproto.admin.defs', 'repoRef'>
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoRef(
-  v: unknown,
-): v is RepoRef & { $type: $Type<'com.atproto.admin.defs', 'repoRef'> } {
-  return is$typed(v, id, 'repoRef')
+const hashRepoRef = 'repoRef'
+
+export function isRepoRef<V>(v: V) {
+  return is$typed(v, id, hashRepoRef)
+}
+
+export function validateRepoRef<V>(v: V) {
+  return validate<RepoRef & V>(v, id, hashRepoRef)
 }
 
-export function validateRepoRef(v: unknown) {
-  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
+export function isValidRepoRef<V>(v: V) {
+  return isValid<RepoRef>(v, id, hashRepoRef)
 }
 
 export interface RepoBlobRef {
+  $type?: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
   did: string
   cid: string
   recordUri?: string
-  [k: string]: unknown
 }
 
-export function isRepoBlobRef(
-  v: unknown,
-): v is RepoBlobRef & {
-  $type: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
-} {
-  return is$typed(v, id, 'repoBlobRef')
+const hashRepoBlobRef = 'repoBlobRef'
+
+export function isRepoBlobRef<V>(v: V) {
+  return is$typed(v, id, hashRepoBlobRef)
+}
+
+export function validateRepoBlobRef<V>(v: V) {
+  return validate<RepoBlobRef & V>(v, id, hashRepoBlobRef)
 }
 
-export function validateRepoBlobRef(v: unknown) {
-  return lexicons.validate(
-    `${id}#repoBlobRef`,
-    v,
-  ) as ValidationResult<RepoBlobRef>
+export function isValidRepoBlobRef<V>(v: V) {
+  return isValid<RepoBlobRef>(v, id, hashRepoBlobRef)
 }
 
 export interface ThreatSignature {
+  $type?: $Type<'com.atproto.admin.defs', 'threatSignature'>
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isThreatSignature(
-  v: unknown,
-): v is ThreatSignature & {
-  $type: $Type<'com.atproto.admin.defs', 'threatSignature'>
-} {
-  return is$typed(v, id, 'threatSignature')
+const hashThreatSignature = 'threatSignature'
+
+export function isThreatSignature<V>(v: V) {
+  return is$typed(v, id, hashThreatSignature)
+}
+
+export function validateThreatSignature<V>(v: V) {
+  return validate<ThreatSignature & V>(v, id, hashThreatSignature)
 }
 
-export function validateThreatSignature(v: unknown) {
-  return lexicons.validate(
-    `${id}#threatSignature`,
-    v,
-  ) as ValidationResult<ThreatSignature>
+export function isValidThreatSignature<V>(v: V) {
+  return isValid<ThreatSignature>(v, id, hashThreatSignature)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 1acca2e1dab..68ebad488ae 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.deleteAccount'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index d36f19ceb36..b31a5692d40 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.disableAccountInvites'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for disabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 9a9db8e9659..75f5d78cc2f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.disableInviteCodes'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   codes?: string[]
   accounts?: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index a9e226a8e5d..e851600390b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.enableAccountInvites'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for enabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index 0cf60326ea3..3add811cb52 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getAccountInfo'
 
 export interface QueryParams {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index fb5c83de25a..4db2f194690 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getAccountInfos'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   infos: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index 80d9487ee8b..5e483dc9583 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from '../server/defs'
+import type * as ComAtprotoServerDefs from '../server/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getInviteCodes'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index 21448f88d6b..e002259fa45 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -4,12 +4,18 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getSubjectStatus'
 
 export interface QueryParams {
@@ -22,13 +28,12 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 6a554d7c424..5cbfa12eca1 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.searchAccounts'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
index baad3c1ee1f..cbe8f4a4d51 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.sendEmail'
 
 export interface QueryParams {}
@@ -19,12 +25,10 @@ export interface InputSchema {
   senderDid: string
   /** Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers */
   comment?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   sent: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index e3aed0b58c9..d127b4b584d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountEmail'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   /** The handle or DID of the repo. */
   account: string
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index 67c54a3b9de..dcd7b1b134e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountHandle'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   did: string
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index c05879469c4..c8af71f908b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountPassword'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   did: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index e6630229fc0..60986aec0c0 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -4,35 +4,39 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateSubjectStatus'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 56ae83a87d4..535dda90897 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.getRecommendedDidCredentials'
 
 export interface QueryParams {}
@@ -18,9 +24,8 @@ export interface OutputSchema {
   /** Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. */
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index b687f9d01bc..ffcd1bf517a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.requestPlcOperationSignature'
 
 export interface QueryParams {}
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index c9e880b7cee..bf795a9ee96 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.resolveHandle'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index c648e5b7ddf..83a046b24a8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.signPlcOperation'
 
 export interface QueryParams {}
@@ -17,15 +23,13 @@ export interface InputSchema {
   token?: string
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface OutputSchema {
   /** A signed DID PLC operation. */
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 3af1814148c..81b238852f3 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.submitPlcOperation'
 
 export interface QueryParams {}
 
 export interface InputSchema {
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
index c54d951e25d..a03f412c8a2 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.updateHandle'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** The new handle. */
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
index 8b0bc71b198..07a0a5293cd 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
+  $type?: $Type<'com.atproto.label.defs', 'label'>
   /** The AT Protocol version of the label object. */
   ver?: number
   /** DID of the actor who created this label. */
@@ -28,57 +35,66 @@ export interface Label {
   exp?: string
   /** Signature of dag-cbor encoded label. */
   sig?: Uint8Array
-  [k: string]: unknown
 }
 
-export function isLabel(
-  v: unknown,
-): v is Label & { $type: $Type<'com.atproto.label.defs', 'label'> } {
-  return is$typed(v, id, 'label')
+const hashLabel = 'label'
+
+export function isLabel<V>(v: V) {
+  return is$typed(v, id, hashLabel)
 }
 
-export function validateLabel(v: unknown) {
-  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
+export function validateLabel<V>(v: V) {
+  return validate<Label & V>(v, id, hashLabel)
+}
+
+export function isValidLabel<V>(v: V) {
+  return isValid<Label>(v, id, hashLabel)
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
 export interface SelfLabels {
+  $type?: $Type<'com.atproto.label.defs', 'selfLabels'>
   values: SelfLabel[]
-  [k: string]: unknown
 }
 
-export function isSelfLabels(
-  v: unknown,
-): v is SelfLabels & { $type: $Type<'com.atproto.label.defs', 'selfLabels'> } {
-  return is$typed(v, id, 'selfLabels')
+const hashSelfLabels = 'selfLabels'
+
+export function isSelfLabels<V>(v: V) {
+  return is$typed(v, id, hashSelfLabels)
+}
+
+export function validateSelfLabels<V>(v: V) {
+  return validate<SelfLabels & V>(v, id, hashSelfLabels)
 }
 
-export function validateSelfLabels(v: unknown) {
-  return lexicons.validate(
-    `${id}#selfLabels`,
-    v,
-  ) as ValidationResult<SelfLabels>
+export function isValidSelfLabels<V>(v: V) {
+  return isValid<SelfLabels>(v, id, hashSelfLabels)
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
 export interface SelfLabel {
+  $type?: $Type<'com.atproto.label.defs', 'selfLabel'>
   /** The short string name of the value or type of this label. */
   val: string
-  [k: string]: unknown
 }
 
-export function isSelfLabel(
-  v: unknown,
-): v is SelfLabel & { $type: $Type<'com.atproto.label.defs', 'selfLabel'> } {
-  return is$typed(v, id, 'selfLabel')
+const hashSelfLabel = 'selfLabel'
+
+export function isSelfLabel<V>(v: V) {
+  return is$typed(v, id, hashSelfLabel)
 }
 
-export function validateSelfLabel(v: unknown) {
-  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
+export function validateSelfLabel<V>(v: V) {
+  return validate<SelfLabel & V>(v, id, hashSelfLabel)
+}
+
+export function isValidSelfLabel<V>(v: V) {
+  return isValid<SelfLabel>(v, id, hashSelfLabel)
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
 export interface LabelValueDefinition {
+  $type?: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
   /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
   identifier: string
   /** How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. */
@@ -90,48 +106,53 @@ export interface LabelValueDefinition {
   /** Does the user need to have adult content enabled in order to configure this label? */
   adultOnly?: boolean
   locales: LabelValueDefinitionStrings[]
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinition(
-  v: unknown,
-): v is LabelValueDefinition & {
-  $type: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
-} {
-  return is$typed(v, id, 'labelValueDefinition')
+const hashLabelValueDefinition = 'labelValueDefinition'
+
+export function isLabelValueDefinition<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinition)
 }
 
-export function validateLabelValueDefinition(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelValueDefinition`,
-    v,
-  ) as ValidationResult<LabelValueDefinition>
+export function validateLabelValueDefinition<V>(v: V) {
+  return validate<LabelValueDefinition & V>(v, id, hashLabelValueDefinition)
+}
+
+export function isValidLabelValueDefinition<V>(v: V) {
+  return isValid<LabelValueDefinition>(v, id, hashLabelValueDefinition)
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
 export interface LabelValueDefinitionStrings {
+  $type?: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
   /** The code of the language these strings are written in. */
   lang: string
   /** A short human-readable name for the label. */
   name: string
   /** A longer description of what the label means and why it might be applied. */
   description: string
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinitionStrings(
-  v: unknown,
-): v is LabelValueDefinitionStrings & {
-  $type: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
-} {
-  return is$typed(v, id, 'labelValueDefinitionStrings')
+const hashLabelValueDefinitionStrings = 'labelValueDefinitionStrings'
+
+export function isLabelValueDefinitionStrings<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinitionStrings)
+}
+
+export function validateLabelValueDefinitionStrings<V>(v: V) {
+  return validate<LabelValueDefinitionStrings & V>(
+    v,
+    id,
+    hashLabelValueDefinitionStrings,
+  )
 }
 
-export function validateLabelValueDefinitionStrings(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelValueDefinitionStrings`,
+export function isValidLabelValueDefinitionStrings<V>(v: V) {
+  return isValid<LabelValueDefinitionStrings>(
     v,
-  ) as ValidationResult<LabelValueDefinitionStrings>
+    id,
+    hashLabelValueDefinitionStrings,
+  )
 }
 
 export type LabelValue =
diff --git a/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
index 62d114a2685..3303143287a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from './defs'
+import type * as ComAtprotoLabelDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.queryLabels'
 
 export interface QueryParams {
@@ -25,7 +31,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
index d09a2240b54..eab540ac06f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -3,12 +3,18 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
-import * as ComAtprotoLabelDefs from './defs'
+import type * as ComAtprotoLabelDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.subscribeLabels'
 
 export interface QueryParams {
@@ -16,10 +22,7 @@ export interface QueryParams {
   cursor?: number
 }
 
-export type OutputSchema =
-  | Labels
-  | Info
-  | { $type: string; [k: string]: unknown }
+export type OutputSchema = $Typed<Labels> | $Typed<Info> | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -33,35 +36,41 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => AsyncIterable<HandlerOutput>
 
 export interface Labels {
+  $type?: $Type<'com.atproto.label.subscribeLabels', 'labels'>
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabels(
-  v: unknown,
-): v is Labels & {
-  $type: $Type<'com.atproto.label.subscribeLabels', 'labels'>
-} {
-  return is$typed(v, id, 'labels')
+const hashLabels = 'labels'
+
+export function isLabels<V>(v: V) {
+  return is$typed(v, id, hashLabels)
+}
+
+export function validateLabels<V>(v: V) {
+  return validate<Labels & V>(v, id, hashLabels)
 }
 
-export function validateLabels(v: unknown) {
-  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
+export function isValidLabels<V>(v: V) {
+  return isValid<Labels>(v, id, hashLabels)
 }
 
 export interface Info {
+  $type?: $Type<'com.atproto.label.subscribeLabels', 'info'>
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(
-  v: unknown,
-): v is Info & { $type: $Type<'com.atproto.label.subscribeLabels', 'info'> } {
-  return is$typed(v, id, 'info')
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
+}
+
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown) {
-  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
+export function isValidInfo<V>(v: V) {
+  return isValid<Info>(v, id, hashInfo)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
index 5095d72d1fe..3cd0a38c3ce 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -4,13 +4,19 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../admin/defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoModerationDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../admin/defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.moderation.createReport'
 
 export interface QueryParams {}
@@ -20,10 +26,9 @@ export interface InputSchema {
   /** Additional context about the content and violation. */
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
 }
 
 export interface OutputSchema {
@@ -31,12 +36,11 @@ export interface OutputSchema {
   reasonType: ComAtprotoModerationDefs.ReasonType
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   reportedBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
index ed67a387dd5..4e2c8e68cbb 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -3,9 +3,15 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
index c1869f1de5a..458470300d7 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.applyWrites'
 
 export interface QueryParams {}
@@ -18,16 +24,18 @@ export interface InputSchema {
   repo: string
   /** Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
-  writes: (Create | Update | Delete)[]
+  writes: ($Typed<Create> | $Typed<Update> | $Typed<Delete>)[]
   /** If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  results?: (CreateResult | UpdateResult | DeleteResult)[]
-  [k: string]: unknown
+  results?: (
+    | $Typed<CreateResult>
+    | $Typed<UpdateResult>
+    | $Typed<DeleteResult>
+  )[]
 }
 
 export interface HandlerInput {
@@ -61,116 +69,125 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Operation which creates a new record. */
 export interface Create {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'create'>
   collection: string
   rkey?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isCreate(
-  v: unknown,
-): v is Create & { $type: $Type<'com.atproto.repo.applyWrites', 'create'> } {
-  return is$typed(v, id, 'create')
+const hashCreate = 'create'
+
+export function isCreate<V>(v: V) {
+  return is$typed(v, id, hashCreate)
+}
+
+export function validateCreate<V>(v: V) {
+  return validate<Create & V>(v, id, hashCreate)
 }
 
-export function validateCreate(v: unknown) {
-  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
+export function isValidCreate<V>(v: V) {
+  return isValid<Create>(v, id, hashCreate)
 }
 
 /** Operation which updates an existing record. */
 export interface Update {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'update'>
   collection: string
   rkey: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isUpdate(
-  v: unknown,
-): v is Update & { $type: $Type<'com.atproto.repo.applyWrites', 'update'> } {
-  return is$typed(v, id, 'update')
+const hashUpdate = 'update'
+
+export function isUpdate<V>(v: V) {
+  return is$typed(v, id, hashUpdate)
 }
 
-export function validateUpdate(v: unknown) {
-  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
+export function validateUpdate<V>(v: V) {
+  return validate<Update & V>(v, id, hashUpdate)
+}
+
+export function isValidUpdate<V>(v: V) {
+  return isValid<Update>(v, id, hashUpdate)
 }
 
 /** Operation which deletes an existing record. */
 export interface Delete {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'delete'>
   collection: string
   rkey: string
-  [k: string]: unknown
 }
 
-export function isDelete(
-  v: unknown,
-): v is Delete & { $type: $Type<'com.atproto.repo.applyWrites', 'delete'> } {
-  return is$typed(v, id, 'delete')
+const hashDelete = 'delete'
+
+export function isDelete<V>(v: V) {
+  return is$typed(v, id, hashDelete)
+}
+
+export function validateDelete<V>(v: V) {
+  return validate<Delete & V>(v, id, hashDelete)
 }
 
-export function validateDelete(v: unknown) {
-  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
+export function isValidDelete<V>(v: V) {
+  return isValid<Delete>(v, id, hashDelete)
 }
 
 export interface CreateResult {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'createResult'>
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isCreateResult(
-  v: unknown,
-): v is CreateResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'createResult'>
-} {
-  return is$typed(v, id, 'createResult')
+const hashCreateResult = 'createResult'
+
+export function isCreateResult<V>(v: V) {
+  return is$typed(v, id, hashCreateResult)
+}
+
+export function validateCreateResult<V>(v: V) {
+  return validate<CreateResult & V>(v, id, hashCreateResult)
 }
 
-export function validateCreateResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#createResult`,
-    v,
-  ) as ValidationResult<CreateResult>
+export function isValidCreateResult<V>(v: V) {
+  return isValid<CreateResult>(v, id, hashCreateResult)
 }
 
 export interface UpdateResult {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isUpdateResult(
-  v: unknown,
-): v is UpdateResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
-} {
-  return is$typed(v, id, 'updateResult')
+const hashUpdateResult = 'updateResult'
+
+export function isUpdateResult<V>(v: V) {
+  return is$typed(v, id, hashUpdateResult)
 }
 
-export function validateUpdateResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#updateResult`,
-    v,
-  ) as ValidationResult<UpdateResult>
+export function validateUpdateResult<V>(v: V) {
+  return validate<UpdateResult & V>(v, id, hashUpdateResult)
+}
+
+export function isValidUpdateResult<V>(v: V) {
+  return isValid<UpdateResult>(v, id, hashUpdateResult)
 }
 
 export interface DeleteResult {
-  [k: string]: unknown
+  $type?: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
+}
+
+const hashDeleteResult = 'deleteResult'
+
+export function isDeleteResult<V>(v: V) {
+  return is$typed(v, id, hashDeleteResult)
 }
 
-export function isDeleteResult(
-  v: unknown,
-): v is DeleteResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
-} {
-  return is$typed(v, id, 'deleteResult')
+export function validateDeleteResult<V>(v: V) {
+  return validate<DeleteResult & V>(v, id, hashDeleteResult)
 }
 
-export function validateDeleteResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#deleteResult`,
-    v,
-  ) as ValidationResult<DeleteResult>
+export function isValidDeleteResult<V>(v: V) {
+  return isValid<DeleteResult>(v, id, hashDeleteResult)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
index b155d82b176..e5bb47d0cec 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.createRecord'
 
 export interface QueryParams {}
@@ -23,10 +29,9 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record itself. Must contain a $type field. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -34,7 +39,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
index eeb0b484b7e..960bb17d66d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
@@ -3,26 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
+  $type?: $Type<'com.atproto.repo.defs', 'commitMeta'>
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
-export function isCommitMeta(
-  v: unknown,
-): v is CommitMeta & { $type: $Type<'com.atproto.repo.defs', 'commitMeta'> } {
-  return is$typed(v, id, 'commitMeta')
+const hashCommitMeta = 'commitMeta'
+
+export function isCommitMeta<V>(v: V) {
+  return is$typed(v, id, hashCommitMeta)
+}
+
+export function validateCommitMeta<V>(v: V) {
+  return validate<CommitMeta & V>(v, id, hashCommitMeta)
 }
 
-export function validateCommitMeta(v: unknown) {
-  return lexicons.validate(
-    `${id}#commitMeta`,
-    v,
-  ) as ValidationResult<CommitMeta>
+export function isValidCommitMeta<V>(v: V) {
+  return isValid<CommitMeta>(v, id, hashCommitMeta)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index f285caa3e28..19a2b19d773 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.deleteRecord'
 
 export interface QueryParams {}
@@ -24,12 +30,10 @@ export interface InputSchema {
   swapRecord?: string
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
index b3774866513..9fb82939ef9 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.describeRepo'
 
 export interface QueryParams {
@@ -21,12 +27,11 @@ export interface OutputSchema {
   handle: string
   did: string
   /** The complete DID document for this account. */
-  didDoc: {}
+  didDoc: { [_ in string]: unknown }
   /** List of all the collections (NSIDs) for which this repo contains at least one record. */
   collections: string[]
   /** Indicates if handle is currently valid (resolves bi-directionally) */
   handleIsCorrect: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
index ff0baecfadd..473b15cc725 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.getRecord'
 
 export interface QueryParams {
@@ -26,8 +32,7 @@ export type InputSchema = undefined
 export interface OutputSchema {
   uri: string
   cid?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
index 3dfc0334549..aa9d2cb1664 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.importRepo'
 
 export interface QueryParams {}
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index 38dc6a63164..86da1a967b8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.listMissingBlobs'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blobs: RecordBlob[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,22 +54,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RecordBlob {
+  $type?: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
   cid: string
   recordUri: string
-  [k: string]: unknown
 }
 
-export function isRecordBlob(
-  v: unknown,
-): v is RecordBlob & {
-  $type: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
-} {
-  return is$typed(v, id, 'recordBlob')
+const hashRecordBlob = 'recordBlob'
+
+export function isRecordBlob<V>(v: V) {
+  return is$typed(v, id, hashRecordBlob)
+}
+
+export function validateRecordBlob<V>(v: V) {
+  return validate<RecordBlob & V>(v, id, hashRecordBlob)
 }
 
-export function validateRecordBlob(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordBlob`,
-    v,
-  ) as ValidationResult<RecordBlob>
+export function isValidRecordBlob<V>(v: V) {
+  return isValid<RecordBlob>(v, id, hashRecordBlob)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
index 51b1393b9a8..479a1507e2f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.listRecords'
 
 export interface QueryParams {
@@ -31,7 +37,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   records: Record[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -60,18 +65,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Record {
+  $type?: $Type<'com.atproto.repo.listRecords', 'record'>
   uri: string
   cid: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'com.atproto.repo.listRecords', 'record'> } {
-  return is$typed(v, id, 'record')
+const hashRecord = 'record'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
index 427fcd8920d..d17ea9f9c14 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.putRecord'
 
 export interface QueryParams {}
@@ -23,12 +29,11 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record to write. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation */
   swapRecord?: string | null
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -36,7 +41,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
index a9298dcbe55..b4bb1c08e62 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -3,23 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
+  $type?: $Type<'com.atproto.repo.strongRef', 'main'>
   uri: string
   cid: string
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'com.atproto.repo.strongRef', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 7fc4618b664..01ffeea7b62 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.uploadBlob'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
index 886a33d1e19..b5f0669df24 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.activateAccount'
 
 export interface QueryParams {}
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index 730ec6aca5b..56dd73e28fa 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.checkAccountStatus'
 
 export interface QueryParams {}
@@ -24,7 +30,6 @@ export interface OutputSchema {
   privateStateValues: number
   expectedBlobs: number
   importedBlobs: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
index f681b0a1e2f..e128c603f53 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.confirmEmail'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   email: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
index bd033e64df2..82f4db53e8a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createAccount'
 
 export interface QueryParams {}
@@ -26,8 +32,7 @@ export interface InputSchema {
   /** DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. */
   recoveryKey?: string
   /** A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. */
-  plcOp?: {}
-  [k: string]: unknown
+  plcOp?: { [_ in string]: unknown }
 }
 
 /** Account login session returned on successful account creation. */
@@ -38,8 +43,7 @@ export interface OutputSchema {
   /** The DID of the new account. */
   did: string
   /** Complete DID document. */
-  didDoc?: {}
-  [k: string]: unknown
+  didDoc?: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 07028659ed2..9616711d2ad 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createAppPassword'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   name: string
   /** If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. */
   privileged?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = AppPassword
@@ -52,24 +57,23 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
   name: string
   password: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(
-  v: unknown,
-): v is AppPassword & {
-  $type: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
-} {
-  return is$typed(v, id, 'appPassword')
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
+}
+
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown) {
-  return lexicons.validate(
-    `${id}#appPassword`,
-    v,
-  ) as ValidationResult<AppPassword>
+export function isValidAppPassword<V>(v: V) {
+  return isValid<AppPassword>(v, id, hashAppPassword)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 27150f98e8a..cfba31bc08e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createInviteCode'
 
 export interface QueryParams {}
@@ -15,12 +21,10 @@ export interface QueryParams {}
 export interface InputSchema {
   useCount: number
   forAccount?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   code: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index 455201cdbc5..b6c739c5804 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createInviteCodes'
 
 export interface QueryParams {}
@@ -16,12 +22,10 @@ export interface InputSchema {
   codeCount: number
   useCount: number
   forAccounts?: string[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   codes: AccountCodes[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -53,22 +57,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AccountCodes {
+  $type?: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
   account: string
   codes: string[]
-  [k: string]: unknown
 }
 
-export function isAccountCodes(
-  v: unknown,
-): v is AccountCodes & {
-  $type: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
-} {
-  return is$typed(v, id, 'accountCodes')
+const hashAccountCodes = 'accountCodes'
+
+export function isAccountCodes<V>(v: V) {
+  return is$typed(v, id, hashAccountCodes)
+}
+
+export function validateAccountCodes<V>(v: V) {
+  return validate<AccountCodes & V>(v, id, hashAccountCodes)
 }
 
-export function validateAccountCodes(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountCodes`,
-    v,
-  ) as ValidationResult<AccountCodes>
+export function isValidAccountCodes<V>(v: V) {
+  return isValid<AccountCodes>(v, id, hashAccountCodes)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
index 8d846520ae9..7a178dd09ef 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createSession'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   identifier: string
   password: string
   authFactorToken?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -25,14 +30,13 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index 126255afd0d..e140ea3c638 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deactivateAccount'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** A recommendation to server as to how long they should hold onto the deactivated account before deleting. */
   deleteAfter?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
index ed33e0b2a0f..d8aa65cfcd2 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
+  $type?: $Type<'com.atproto.server.defs', 'inviteCode'>
   code: string
   available: number
   disabled: boolean
@@ -16,39 +23,38 @@ export interface InviteCode {
   createdBy: string
   createdAt: string
   uses: InviteCodeUse[]
-  [k: string]: unknown
 }
 
-export function isInviteCode(
-  v: unknown,
-): v is InviteCode & { $type: $Type<'com.atproto.server.defs', 'inviteCode'> } {
-  return is$typed(v, id, 'inviteCode')
+const hashInviteCode = 'inviteCode'
+
+export function isInviteCode<V>(v: V) {
+  return is$typed(v, id, hashInviteCode)
+}
+
+export function validateInviteCode<V>(v: V) {
+  return validate<InviteCode & V>(v, id, hashInviteCode)
 }
 
-export function validateInviteCode(v: unknown) {
-  return lexicons.validate(
-    `${id}#inviteCode`,
-    v,
-  ) as ValidationResult<InviteCode>
+export function isValidInviteCode<V>(v: V) {
+  return isValid<InviteCode>(v, id, hashInviteCode)
 }
 
 export interface InviteCodeUse {
+  $type?: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
   usedBy: string
   usedAt: string
-  [k: string]: unknown
 }
 
-export function isInviteCodeUse(
-  v: unknown,
-): v is InviteCodeUse & {
-  $type: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
-} {
-  return is$typed(v, id, 'inviteCodeUse')
+const hashInviteCodeUse = 'inviteCodeUse'
+
+export function isInviteCodeUse<V>(v: V) {
+  return is$typed(v, id, hashInviteCodeUse)
+}
+
+export function validateInviteCodeUse<V>(v: V) {
+  return validate<InviteCodeUse & V>(v, id, hashInviteCodeUse)
 }
 
-export function validateInviteCodeUse(v: unknown) {
-  return lexicons.validate(
-    `${id}#inviteCodeUse`,
-    v,
-  ) as ValidationResult<InviteCodeUse>
+export function isValidInviteCodeUse<V>(v: V) {
+  return isValid<InviteCodeUse>(v, id, hashInviteCodeUse)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
index e082e24ae10..55eceb8a979 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deleteAccount'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   did: string
   password: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
index 90c6882cf87..3ef21a16c51 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deleteSession'
 
 export interface QueryParams {}
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
index 736b7968877..e173e01549d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.describeServer'
 
 export interface QueryParams {}
@@ -24,7 +30,6 @@ export interface OutputSchema {
   links?: Links
   contact?: Contact
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -53,34 +58,40 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Links {
+  $type?: $Type<'com.atproto.server.describeServer', 'links'>
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(
-  v: unknown,
-): v is Links & { $type: $Type<'com.atproto.server.describeServer', 'links'> } {
-  return is$typed(v, id, 'links')
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
+}
+
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown) {
-  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
+export function isValidLinks<V>(v: V) {
+  return isValid<Links>(v, id, hashLinks)
 }
 
 export interface Contact {
+  $type?: $Type<'com.atproto.server.describeServer', 'contact'>
   email?: string
-  [k: string]: unknown
 }
 
-export function isContact(
-  v: unknown,
-): v is Contact & {
-  $type: $Type<'com.atproto.server.describeServer', 'contact'>
-} {
-  return is$typed(v, id, 'contact')
+const hashContact = 'contact'
+
+export function isContact<V>(v: V) {
+  return is$typed(v, id, hashContact)
+}
+
+export function validateContact<V>(v: V) {
+  return validate<Contact & V>(v, id, hashContact)
 }
 
-export function validateContact(v: unknown) {
-  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
+export function isValidContact<V>(v: V) {
+  return isValid<Contact>(v, id, hashContact)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 9668cf1f1e6..22962387ec0 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from './defs'
+import type * as ComAtprotoServerDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getAccountInviteCodes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 54b3a3d4423..eb2c4131d7a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getServiceAuth'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   token: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
index e98c753d9d0..bccc27b5931 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getSession'
 
 export interface QueryParams {}
@@ -20,11 +26,10 @@ export interface OutputSchema {
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index d868bbcb743..7a5c093fb08 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.listAppPasswords'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   passwords: AppPassword[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -46,23 +51,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
   name: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(
-  v: unknown,
-): v is AppPassword & {
-  $type: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
-} {
-  return is$typed(v, id, 'appPassword')
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
+}
+
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown) {
-  return lexicons.validate(
-    `${id}#appPassword`,
-    v,
-  ) as ValidationResult<AppPassword>
+export function isValidAppPassword<V>(v: V) {
+  return isValid<AppPassword>(v, id, hashAppPassword)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
index de1b570bf1a..ffbaaf3518f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.refreshSession'
 
 export interface QueryParams {}
@@ -19,11 +25,10 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** Hosting status of the account. If not specified, then assume 'active'. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 85131190ec9..016751b9480 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestAccountDelete'
 
 export interface QueryParams {}
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index fb58814aeb4..51e01eb4063 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestEmailConfirmation'
 
 export interface QueryParams {}
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 919e704328a..eb93689edfa 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestEmailUpdate'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   tokenRequired: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index f9bcec52a1f..d0229992fe0 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestPasswordReset'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 64dfb8c8414..fd1cd466f54 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.reserveSigningKey'
 
 export interface QueryParams {}
@@ -15,13 +21,11 @@ export interface QueryParams {}
 export interface InputSchema {
   /** The DID to reserve a key for. */
   did?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   /** The public key for the reserved signing key, in did:key serialization. */
   signingKey: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
index d842e7e266d..c137ee2c256 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.resetPassword'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   token: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 92a8204560e..134624bbdc9 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.revokeAppPassword'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   name: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
index 4381078a0a6..f2346c39f1f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.updateEmail'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   emailAuthFactor?: boolean
   /** Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. */
   token?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
index d42913abd01..96b1f8120fa 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getBlob'
 
 export interface QueryParams {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
index a7dc7e73000..8a3dc3fef63 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getBlocks'
 
 export interface QueryParams {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 53d5b4bf39b..a2aba307807 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getCheckout'
 
 export interface QueryParams {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
index 1adceb80d8a..35bc0192941 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getHead'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index 290c02e15fa..fe6eb20d335 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getLatestCommit'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
index 8f03eb23951..793596f713b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRecord'
 
 export interface QueryParams {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
index 9cde9a4e01b..e30bfbe96e6 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRepo'
 
 export interface QueryParams {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 414e67e7a67..6cebcb8cda8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRepoStatus'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export interface OutputSchema {
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
index 58fea9c1282..7ae1bb24487 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.listBlobs'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   cids: string[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
index 468977d448c..1980cda20c1 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.listRepos'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: Repo[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,6 +54,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Repo {
+  $type?: $Type<'com.atproto.sync.listRepos', 'repo'>
   did: string
   /** Current repo commit CID */
   head: string
@@ -56,15 +62,18 @@ export interface Repo {
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isRepo(
-  v: unknown,
-): v is Repo & { $type: $Type<'com.atproto.sync.listRepos', 'repo'> } {
-  return is$typed(v, id, 'repo')
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
+}
+
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
 }
 
-export function validateRepo(v: unknown) {
-  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
+export function isValidRepo<V>(v: V) {
+  return isValid<Repo>(v, id, hashRepo)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index 8fd62afe59e..fecb69994d2 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.notifyOfUpdate'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Hostname of the current service (usually a PDS) that is notifying of update. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index 5148b8c5f24..c2eeab14f4e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.requestCrawl'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Hostname of the current service (eg, PDS) that is requesting to be crawled. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 7c759389c2a..4d7a7444f92 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -3,11 +3,17 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.subscribeRepos'
 
 export interface QueryParams {
@@ -16,14 +22,14 @@ export interface QueryParams {
 }
 
 export type OutputSchema =
-  | Commit
-  | Identity
-  | Account
-  | Handle
-  | Migrate
-  | Tombstone
-  | Info
-  | { $type: string; [k: string]: unknown }
+  | $Typed<Commit>
+  | $Typed<Identity>
+  | $Typed<Account>
+  | $Typed<Handle>
+  | $Typed<Migrate>
+  | $Typed<Tombstone>
+  | $Typed<Info>
+  | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor' | 'ConsumerTooSlow'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -38,6 +44,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. */
 export interface Commit {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'commit'>
   /** The stream sequence number of this message. */
   seq: number
   /** DEPRECATED -- unused */
@@ -60,43 +67,49 @@ export interface Commit {
   blobs: CID[]
   /** Timestamp of when this message was originally broadcast. */
   time: string
-  [k: string]: unknown
 }
 
-export function isCommit(
-  v: unknown,
-): v is Commit & { $type: $Type<'com.atproto.sync.subscribeRepos', 'commit'> } {
-  return is$typed(v, id, 'commit')
+const hashCommit = 'commit'
+
+export function isCommit<V>(v: V) {
+  return is$typed(v, id, hashCommit)
+}
+
+export function validateCommit<V>(v: V) {
+  return validate<Commit & V>(v, id, hashCommit)
 }
 
-export function validateCommit(v: unknown) {
-  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
+export function isValidCommit<V>(v: V) {
+  return isValid<Commit>(v, id, hashCommit)
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
   seq: number
   did: string
   time: string
   /** The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details. */
   handle?: string
-  [k: string]: unknown
 }
 
-export function isIdentity(
-  v: unknown,
-): v is Identity & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
-} {
-  return is$typed(v, id, 'identity')
+const hashIdentity = 'identity'
+
+export function isIdentity<V>(v: V) {
+  return is$typed(v, id, hashIdentity)
+}
+
+export function validateIdentity<V>(v: V) {
+  return validate<Identity & V>(v, id, hashIdentity)
 }
 
-export function validateIdentity(v: unknown) {
-  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
+export function isValidIdentity<V>(v: V) {
+  return isValid<Identity>(v, id, hashIdentity)
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
 export interface Account {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'account'>
   seq: number
   did: string
   time: string
@@ -104,112 +117,129 @@ export interface Account {
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
   status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isAccount(
-  v: unknown,
-): v is Account & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'account'>
-} {
-  return is$typed(v, id, 'account')
+const hashAccount = 'account'
+
+export function isAccount<V>(v: V) {
+  return is$typed(v, id, hashAccount)
+}
+
+export function validateAccount<V>(v: V) {
+  return validate<Account & V>(v, id, hashAccount)
 }
 
-export function validateAccount(v: unknown) {
-  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
+export function isValidAccount<V>(v: V) {
+  return isValid<Account>(v, id, hashAccount)
 }
 
 /** DEPRECATED -- Use #identity event instead */
 export interface Handle {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'handle'>
   seq: number
   did: string
   handle: string
   time: string
-  [k: string]: unknown
 }
 
-export function isHandle(
-  v: unknown,
-): v is Handle & { $type: $Type<'com.atproto.sync.subscribeRepos', 'handle'> } {
-  return is$typed(v, id, 'handle')
+const hashHandle = 'handle'
+
+export function isHandle<V>(v: V) {
+  return is$typed(v, id, hashHandle)
+}
+
+export function validateHandle<V>(v: V) {
+  return validate<Handle & V>(v, id, hashHandle)
 }
 
-export function validateHandle(v: unknown) {
-  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
+export function isValidHandle<V>(v: V) {
+  return isValid<Handle>(v, id, hashHandle)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Migrate {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
   seq: number
   did: string
   migrateTo: string | null
   time: string
-  [k: string]: unknown
 }
 
-export function isMigrate(
-  v: unknown,
-): v is Migrate & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
-} {
-  return is$typed(v, id, 'migrate')
+const hashMigrate = 'migrate'
+
+export function isMigrate<V>(v: V) {
+  return is$typed(v, id, hashMigrate)
+}
+
+export function validateMigrate<V>(v: V) {
+  return validate<Migrate & V>(v, id, hashMigrate)
 }
 
-export function validateMigrate(v: unknown) {
-  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
+export function isValidMigrate<V>(v: V) {
+  return isValid<Migrate>(v, id, hashMigrate)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Tombstone {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
   seq: number
   did: string
   time: string
-  [k: string]: unknown
 }
 
-export function isTombstone(
-  v: unknown,
-): v is Tombstone & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
-} {
-  return is$typed(v, id, 'tombstone')
+const hashTombstone = 'tombstone'
+
+export function isTombstone<V>(v: V) {
+  return is$typed(v, id, hashTombstone)
+}
+
+export function validateTombstone<V>(v: V) {
+  return validate<Tombstone & V>(v, id, hashTombstone)
 }
 
-export function validateTombstone(v: unknown) {
-  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
+export function isValidTombstone<V>(v: V) {
+  return isValid<Tombstone>(v, id, hashTombstone)
 }
 
 export interface Info {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'info'>
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(
-  v: unknown,
-): v is Info & { $type: $Type<'com.atproto.sync.subscribeRepos', 'info'> } {
-  return is$typed(v, id, 'info')
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
+}
+
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown) {
-  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
+export function isValidInfo<V>(v: V) {
+  return isValid<Info>(v, id, hashInfo)
 }
 
 /** A repo operation, ie a mutation of a single record. */
 export interface RepoOp {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'>
   action: 'create' | 'update' | 'delete' | (string & {})
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  [k: string]: unknown
 }
 
-export function isRepoOp(
-  v: unknown,
-): v is RepoOp & { $type: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'> } {
-  return is$typed(v, id, 'repoOp')
+const hashRepoOp = 'repoOp'
+
+export function isRepoOp<V>(v: V) {
+  return is$typed(v, id, hashRepoOp)
+}
+
+export function validateRepoOp<V>(v: V) {
+  return validate<RepoOp & V>(v, id, hashRepoOp)
 }
 
-export function validateRepoOp(v: unknown) {
-  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
+export function isValidRepoOp<V>(v: V) {
+  return isValid<RepoOp>(v, id, hashRepoOp)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index 374ab85c589..c7057a308f1 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -4,22 +4,25 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.addReservedHandle'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   handle: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 948068c5a6d..84ea4beae25 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.checkSignupQueue'
 
 export interface QueryParams {}
@@ -18,7 +24,6 @@ export interface OutputSchema {
   activated: boolean
   placeInQueue?: number
   estimatedTimeMs?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index c8741a1331b..887b31780a8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from '../label/defs'
+import type * as ComAtprotoLabelDefs from '../label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.fetchLabels'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index 556fe779d21..cf9f08e088e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.requestPhoneVerification'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   phoneNumber: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/util.ts b/packages/bsky/src/lexicon/util.ts
index a8b8cc9e0b7..2d83b0960f1 100644
--- a/packages/bsky/src/lexicon/util.ts
+++ b/packages/bsky/src/lexicon/util.ts
@@ -1,39 +1,62 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
+export type OmitKey<T, K extends keyof T> = {
+  [K2 in keyof T as K2 extends K ? never : K2]: T[K2]
+}
+
 export type $Typed<V> = V & { $type: string }
 
 export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
   ? Id | `${Id}#${Hash}`
   : `${Id}#${Hash}`
 
-function has$type<V>(v: V): v is $Typed<V & object> {
-  return (
-    v != null &&
-    typeof v === 'object' &&
-    '$type' in v &&
-    typeof v.$type === 'string'
-  )
+function isObject<V>(v: V): v is V & object {
+  return v != null && typeof v === 'object'
 }
 
 function check$type<Id extends string, Hash extends string>(
-  $type: string,
+  $type: unknown,
   id: Id,
   hash: Hash,
 ): $type is $Type<Id, Hash> {
   return $type === id
     ? hash === 'main'
     : // $type === `${id}#${hash}`
-      $type.length === id.length + 1 + hash.length &&
+      typeof $type === 'string' &&
+        $type.length === id.length + 1 + hash.length &&
         $type.charCodeAt(id.length) === 35 /* '#' */ &&
         $type.startsWith(id) &&
         $type.endsWith(hash)
 }
 
+export type Is$Typed<V, Id extends string, Hash extends string> = V extends {
+  $type: $Type<Id, Hash>
+}
+  ? V
+  : V extends { $type?: string }
+    ? V extends { $type?: $Type<Id, Hash> }
+      ? $Typed<V>
+      : never
+    : V & { $type: $Type<Id, Hash> }
+
 export function is$typed<V, Id extends string, Hash extends string>(
   v: V,
   id: Id,
   hash: Hash,
-): v is V & object & { $type: $Type<Id, Hash> } {
-  return has$type(v) && check$type(v.$type, id, hash)
+): v is Is$Typed<V, Id, Hash> {
+  return isObject(v) && '$type' in v && check$type(v.$type, id, hash)
+}
+
+export function maybe$typed<V, Id extends string, Hash extends string>(
+  v: V,
+  id: Id,
+  hash: Hash,
+): v is V & object & { $type?: $Type<Id, Hash> } {
+  return (
+    isObject(v) &&
+    ('$type' in v
+      ? v.$type === undefined || check$type(v.$type, id, hash)
+      : true)
+  )
 }
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 32bd89f98a4..adc2ae7f0a9 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -1,7 +1,13 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { LexiconDoc, Lexicons } from '@atproto/lexicon'
+import {
+  LexiconDoc,
+  Lexicons,
+  ValidationError,
+  ValidationResult,
+} from '@atproto/lexicon'
+import { $Typed, is$typed, maybe$typed } from './util'
 
 export const schemaDict = {
   ComAtprotoAdminDefs: {
@@ -13575,6 +13581,44 @@ export const schemaDict = {
 
 export const schemas = Object.values(schemaDict)
 export const lexicons: Lexicons = new Lexicons(schemas)
+
+export function validate<V>(v: unknown, id: string, hash: string) {
+  return (
+    maybe$typed(v, id, hash)
+      ? lexicons.validate(`${id}#${hash}`, v)
+      : {
+          success: false,
+          error: new ValidationError(
+            `Must be an object with "${id}#${hash}" $type property`,
+          ),
+        }
+  ) as ValidationResult<V>
+}
+
+export function isValid<V extends { $type?: string }>(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType: true,
+): v is $Typed<V>
+export function isValid<V extends { $type?: string }>(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType?: boolean,
+): v is V
+export function isValid(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType?: boolean,
+) {
+  return (
+    (requiredType ? is$typed : maybe$typed)(v, id, hash) &&
+    validate(v, id, hash).success
+  )
+}
+
 export const ids = {
   ComAtprotoAdminDefs: 'com.atproto.admin.defs',
   ComAtprotoAdminDeleteAccount: 'com.atproto.admin.deleteAccount',
@@ -13825,4 +13869,4 @@ export const ids = {
   ToolsOzoneTeamDeleteMember: 'tools.ozone.team.deleteMember',
   ToolsOzoneTeamListMembers: 'tools.ozone.team.listMembers',
   ToolsOzoneTeamUpdateMember: 'tools.ozone.team.updateMember',
-}
+} as const
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
index 92c6cd53d28..5e42bd080d5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
@@ -3,15 +3,22 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyGraphDefs from '../graph/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
   did: string
   handle: string
   displayName?: string
@@ -20,25 +27,24 @@ export interface ProfileViewBasic {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   createdAt?: string
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(
-  v: unknown,
-): v is ProfileViewBasic & {
-  $type: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
-} {
-  return is$typed(v, id, 'profileViewBasic')
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewBasic`,
-    v,
-  ) as ValidationResult<ProfileViewBasic>
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
+}
+
+export function isValidProfileViewBasic<V>(v: V) {
+  return isValid<ProfileViewBasic>(v, id, hashProfileViewBasic)
 }
 
 export interface ProfileView {
+  $type?: $Type<'app.bsky.actor.defs', 'profileView'>
   did: string
   handle: string
   displayName?: string
@@ -49,23 +55,24 @@ export interface ProfileView {
   createdAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isProfileView(
-  v: unknown,
-): v is ProfileView & { $type: $Type<'app.bsky.actor.defs', 'profileView'> } {
-  return is$typed(v, id, 'profileView')
+const hashProfileView = 'profileView'
+
+export function isProfileView<V>(v: V) {
+  return is$typed(v, id, hashProfileView)
+}
+
+export function validateProfileView<V>(v: V) {
+  return validate<ProfileView & V>(v, id, hashProfileView)
 }
 
-export function validateProfileView(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileView`,
-    v,
-  ) as ValidationResult<ProfileView>
+export function isValidProfileView<V>(v: V) {
+  return isValid<ProfileView>(v, id, hashProfileView)
 }
 
 export interface ProfileViewDetailed {
+  $type?: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
   did: string
   handle: string
   displayName?: string
@@ -82,70 +89,67 @@ export interface ProfileViewDetailed {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   pinnedPost?: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isProfileViewDetailed(
-  v: unknown,
-): v is ProfileViewDetailed & {
-  $type: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
-} {
-  return is$typed(v, id, 'profileViewDetailed')
+const hashProfileViewDetailed = 'profileViewDetailed'
+
+export function isProfileViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashProfileViewDetailed)
+}
+
+export function validateProfileViewDetailed<V>(v: V) {
+  return validate<ProfileViewDetailed & V>(v, id, hashProfileViewDetailed)
 }
 
-export function validateProfileViewDetailed(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewDetailed`,
-    v,
-  ) as ValidationResult<ProfileViewDetailed>
+export function isValidProfileViewDetailed<V>(v: V) {
+  return isValid<ProfileViewDetailed>(v, id, hashProfileViewDetailed)
 }
 
 export interface ProfileAssociated {
+  $type?: $Type<'app.bsky.actor.defs', 'profileAssociated'>
   lists?: number
   feedgens?: number
   starterPacks?: number
   labeler?: boolean
   chat?: ProfileAssociatedChat
-  [k: string]: unknown
 }
 
-export function isProfileAssociated(
-  v: unknown,
-): v is ProfileAssociated & {
-  $type: $Type<'app.bsky.actor.defs', 'profileAssociated'>
-} {
-  return is$typed(v, id, 'profileAssociated')
+const hashProfileAssociated = 'profileAssociated'
+
+export function isProfileAssociated<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociated)
+}
+
+export function validateProfileAssociated<V>(v: V) {
+  return validate<ProfileAssociated & V>(v, id, hashProfileAssociated)
 }
 
-export function validateProfileAssociated(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileAssociated`,
-    v,
-  ) as ValidationResult<ProfileAssociated>
+export function isValidProfileAssociated<V>(v: V) {
+  return isValid<ProfileAssociated>(v, id, hashProfileAssociated)
 }
 
 export interface ProfileAssociatedChat {
+  $type?: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
-  [k: string]: unknown
 }
 
-export function isProfileAssociatedChat(
-  v: unknown,
-): v is ProfileAssociatedChat & {
-  $type: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
-} {
-  return is$typed(v, id, 'profileAssociatedChat')
+const hashProfileAssociatedChat = 'profileAssociatedChat'
+
+export function isProfileAssociatedChat<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociatedChat)
 }
 
-export function validateProfileAssociatedChat(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileAssociatedChat`,
-    v,
-  ) as ValidationResult<ProfileAssociatedChat>
+export function validateProfileAssociatedChat<V>(v: V) {
+  return validate<ProfileAssociatedChat & V>(v, id, hashProfileAssociatedChat)
+}
+
+export function isValidProfileAssociatedChat<V>(v: V) {
+  return isValid<ProfileAssociatedChat>(v, id, hashProfileAssociatedChat)
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: $Type<'app.bsky.actor.defs', 'viewerState'>
   muted?: boolean
   mutedByList?: AppBskyGraphDefs.ListViewBasic
   blockedBy?: boolean
@@ -154,185 +158,184 @@ export interface ViewerState {
   following?: string
   followedBy?: string
   knownFollowers?: KnownFollowers
-  [k: string]: unknown
 }
 
-export function isViewerState(
-  v: unknown,
-): v is ViewerState & { $type: $Type<'app.bsky.actor.defs', 'viewerState'> } {
-  return is$typed(v, id, 'viewerState')
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
+}
+
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerState`,
-    v,
-  ) as ValidationResult<ViewerState>
+export function isValidViewerState<V>(v: V) {
+  return isValid<ViewerState>(v, id, hashViewerState)
 }
 
 /** The subject's followers whom you also follow */
 export interface KnownFollowers {
+  $type?: $Type<'app.bsky.actor.defs', 'knownFollowers'>
   count: number
   followers: ProfileViewBasic[]
-  [k: string]: unknown
 }
 
-export function isKnownFollowers(
-  v: unknown,
-): v is KnownFollowers & {
-  $type: $Type<'app.bsky.actor.defs', 'knownFollowers'>
-} {
-  return is$typed(v, id, 'knownFollowers')
+const hashKnownFollowers = 'knownFollowers'
+
+export function isKnownFollowers<V>(v: V) {
+  return is$typed(v, id, hashKnownFollowers)
+}
+
+export function validateKnownFollowers<V>(v: V) {
+  return validate<KnownFollowers & V>(v, id, hashKnownFollowers)
 }
 
-export function validateKnownFollowers(v: unknown) {
-  return lexicons.validate(
-    `${id}#knownFollowers`,
-    v,
-  ) as ValidationResult<KnownFollowers>
+export function isValidKnownFollowers<V>(v: V) {
+  return isValid<KnownFollowers>(v, id, hashKnownFollowers)
 }
 
 export type Preferences = (
-  | AdultContentPref
-  | ContentLabelPref
-  | SavedFeedsPref
-  | SavedFeedsPrefV2
-  | PersonalDetailsPref
-  | FeedViewPref
-  | ThreadViewPref
-  | InterestsPref
-  | MutedWordsPref
-  | HiddenPostsPref
-  | BskyAppStatePref
-  | LabelersPref
-  | { $type: string; [k: string]: unknown }
+  | $Typed<AdultContentPref>
+  | $Typed<ContentLabelPref>
+  | $Typed<SavedFeedsPref>
+  | $Typed<SavedFeedsPrefV2>
+  | $Typed<PersonalDetailsPref>
+  | $Typed<FeedViewPref>
+  | $Typed<ThreadViewPref>
+  | $Typed<InterestsPref>
+  | $Typed<MutedWordsPref>
+  | $Typed<HiddenPostsPref>
+  | $Typed<BskyAppStatePref>
+  | $Typed<LabelersPref>
+  | { $type: string }
 )[]
 
 export interface AdultContentPref {
+  $type?: $Type<'app.bsky.actor.defs', 'adultContentPref'>
   enabled: boolean
-  [k: string]: unknown
 }
 
-export function isAdultContentPref(
-  v: unknown,
-): v is AdultContentPref & {
-  $type: $Type<'app.bsky.actor.defs', 'adultContentPref'>
-} {
-  return is$typed(v, id, 'adultContentPref')
+const hashAdultContentPref = 'adultContentPref'
+
+export function isAdultContentPref<V>(v: V) {
+  return is$typed(v, id, hashAdultContentPref)
 }
 
-export function validateAdultContentPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#adultContentPref`,
-    v,
-  ) as ValidationResult<AdultContentPref>
+export function validateAdultContentPref<V>(v: V) {
+  return validate<AdultContentPref & V>(v, id, hashAdultContentPref)
+}
+
+export function isValidAdultContentPref<V>(v: V) {
+  return isValid<AdultContentPref>(v, id, hashAdultContentPref)
 }
 
 export interface ContentLabelPref {
+  $type?: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
   /** Which labeler does this preference apply to? If undefined, applies globally. */
   labelerDid?: string
   label: string
   visibility: 'ignore' | 'show' | 'warn' | 'hide' | (string & {})
-  [k: string]: unknown
 }
 
-export function isContentLabelPref(
-  v: unknown,
-): v is ContentLabelPref & {
-  $type: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
-} {
-  return is$typed(v, id, 'contentLabelPref')
+const hashContentLabelPref = 'contentLabelPref'
+
+export function isContentLabelPref<V>(v: V) {
+  return is$typed(v, id, hashContentLabelPref)
+}
+
+export function validateContentLabelPref<V>(v: V) {
+  return validate<ContentLabelPref & V>(v, id, hashContentLabelPref)
 }
 
-export function validateContentLabelPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#contentLabelPref`,
-    v,
-  ) as ValidationResult<ContentLabelPref>
+export function isValidContentLabelPref<V>(v: V) {
+  return isValid<ContentLabelPref>(v, id, hashContentLabelPref)
 }
 
 export interface SavedFeed {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeed'>
   id: string
   type: 'feed' | 'list' | 'timeline' | (string & {})
   value: string
   pinned: boolean
-  [k: string]: unknown
 }
 
-export function isSavedFeed(
-  v: unknown,
-): v is SavedFeed & { $type: $Type<'app.bsky.actor.defs', 'savedFeed'> } {
-  return is$typed(v, id, 'savedFeed')
+const hashSavedFeed = 'savedFeed'
+
+export function isSavedFeed<V>(v: V) {
+  return is$typed(v, id, hashSavedFeed)
+}
+
+export function validateSavedFeed<V>(v: V) {
+  return validate<SavedFeed & V>(v, id, hashSavedFeed)
 }
 
-export function validateSavedFeed(v: unknown) {
-  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
+export function isValidSavedFeed<V>(v: V) {
+  return isValid<SavedFeed>(v, id, hashSavedFeed)
 }
 
 export interface SavedFeedsPrefV2 {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
   items: SavedFeed[]
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(
-  v: unknown,
-): v is SavedFeedsPrefV2 & {
-  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
-} {
-  return is$typed(v, id, 'savedFeedsPrefV2')
+const hashSavedFeedsPrefV2 = 'savedFeedsPrefV2'
+
+export function isSavedFeedsPrefV2<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPrefV2)
 }
 
-export function validateSavedFeedsPrefV2(v: unknown) {
-  return lexicons.validate(
-    `${id}#savedFeedsPrefV2`,
-    v,
-  ) as ValidationResult<SavedFeedsPrefV2>
+export function validateSavedFeedsPrefV2<V>(v: V) {
+  return validate<SavedFeedsPrefV2 & V>(v, id, hashSavedFeedsPrefV2)
+}
+
+export function isValidSavedFeedsPrefV2<V>(v: V) {
+  return isValid<SavedFeedsPrefV2>(v, id, hashSavedFeedsPrefV2)
 }
 
 export interface SavedFeedsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
   pinned: string[]
   saved: string[]
   timelineIndex?: number
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPref(
-  v: unknown,
-): v is SavedFeedsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
-} {
-  return is$typed(v, id, 'savedFeedsPref')
+const hashSavedFeedsPref = 'savedFeedsPref'
+
+export function isSavedFeedsPref<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPref)
+}
+
+export function validateSavedFeedsPref<V>(v: V) {
+  return validate<SavedFeedsPref & V>(v, id, hashSavedFeedsPref)
 }
 
-export function validateSavedFeedsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#savedFeedsPref`,
-    v,
-  ) as ValidationResult<SavedFeedsPref>
+export function isValidSavedFeedsPref<V>(v: V) {
+  return isValid<SavedFeedsPref>(v, id, hashSavedFeedsPref)
 }
 
 export interface PersonalDetailsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
   /** The birth date of account owner. */
   birthDate?: string
-  [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(
-  v: unknown,
-): v is PersonalDetailsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
-} {
-  return is$typed(v, id, 'personalDetailsPref')
+const hashPersonalDetailsPref = 'personalDetailsPref'
+
+export function isPersonalDetailsPref<V>(v: V) {
+  return is$typed(v, id, hashPersonalDetailsPref)
+}
+
+export function validatePersonalDetailsPref<V>(v: V) {
+  return validate<PersonalDetailsPref & V>(v, id, hashPersonalDetailsPref)
 }
 
-export function validatePersonalDetailsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#personalDetailsPref`,
-    v,
-  ) as ValidationResult<PersonalDetailsPref>
+export function isValidPersonalDetailsPref<V>(v: V) {
+  return isValid<PersonalDetailsPref>(v, id, hashPersonalDetailsPref)
 }
 
 export interface FeedViewPref {
+  $type?: $Type<'app.bsky.actor.defs', 'feedViewPref'>
   /** The URI of the feed, or an identifier which describes the feed. */
   feed: string
   /** Hide replies in the feed. */
@@ -345,23 +348,24 @@ export interface FeedViewPref {
   hideReposts?: boolean
   /** Hide quote posts in the feed. */
   hideQuotePosts?: boolean
-  [k: string]: unknown
 }
 
-export function isFeedViewPref(
-  v: unknown,
-): v is FeedViewPref & { $type: $Type<'app.bsky.actor.defs', 'feedViewPref'> } {
-  return is$typed(v, id, 'feedViewPref')
+const hashFeedViewPref = 'feedViewPref'
+
+export function isFeedViewPref<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPref)
 }
 
-export function validateFeedViewPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#feedViewPref`,
-    v,
-  ) as ValidationResult<FeedViewPref>
+export function validateFeedViewPref<V>(v: V) {
+  return validate<FeedViewPref & V>(v, id, hashFeedViewPref)
+}
+
+export function isValidFeedViewPref<V>(v: V) {
+  return isValid<FeedViewPref>(v, id, hashFeedViewPref)
 }
 
 export interface ThreadViewPref {
+  $type?: $Type<'app.bsky.actor.defs', 'threadViewPref'>
   /** Sorting mode for threads. */
   sort?:
     | 'oldest'
@@ -372,49 +376,47 @@ export interface ThreadViewPref {
     | (string & {})
   /** Show followed users at the top of all replies. */
   prioritizeFollowedUsers?: boolean
-  [k: string]: unknown
 }
 
-export function isThreadViewPref(
-  v: unknown,
-): v is ThreadViewPref & {
-  $type: $Type<'app.bsky.actor.defs', 'threadViewPref'>
-} {
-  return is$typed(v, id, 'threadViewPref')
+const hashThreadViewPref = 'threadViewPref'
+
+export function isThreadViewPref<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPref)
+}
+
+export function validateThreadViewPref<V>(v: V) {
+  return validate<ThreadViewPref & V>(v, id, hashThreadViewPref)
 }
 
-export function validateThreadViewPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadViewPref`,
-    v,
-  ) as ValidationResult<ThreadViewPref>
+export function isValidThreadViewPref<V>(v: V) {
+  return isValid<ThreadViewPref>(v, id, hashThreadViewPref)
 }
 
 export interface InterestsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'interestsPref'>
   /** A list of tags which describe the account owner's interests gathered during onboarding. */
   tags: string[]
-  [k: string]: unknown
 }
 
-export function isInterestsPref(
-  v: unknown,
-): v is InterestsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'interestsPref'>
-} {
-  return is$typed(v, id, 'interestsPref')
+const hashInterestsPref = 'interestsPref'
+
+export function isInterestsPref<V>(v: V) {
+  return is$typed(v, id, hashInterestsPref)
+}
+
+export function validateInterestsPref<V>(v: V) {
+  return validate<InterestsPref & V>(v, id, hashInterestsPref)
 }
 
-export function validateInterestsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#interestsPref`,
-    v,
-  ) as ValidationResult<InterestsPref>
+export function isValidInterestsPref<V>(v: V) {
+  return isValid<InterestsPref>(v, id, hashInterestsPref)
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
 
 /** A word that the account owner has muted. */
 export interface MutedWord {
+  $type?: $Type<'app.bsky.actor.defs', 'mutedWord'>
   id?: string
   /** The muted word itself. */
   value: string
@@ -424,162 +426,165 @@ export interface MutedWord {
   actorTarget: 'all' | 'exclude-following' | (string & {})
   /** The date and time at which the muted word will expire and no longer be applied. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isMutedWord(
-  v: unknown,
-): v is MutedWord & { $type: $Type<'app.bsky.actor.defs', 'mutedWord'> } {
-  return is$typed(v, id, 'mutedWord')
+const hashMutedWord = 'mutedWord'
+
+export function isMutedWord<V>(v: V) {
+  return is$typed(v, id, hashMutedWord)
 }
 
-export function validateMutedWord(v: unknown) {
-  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
+export function validateMutedWord<V>(v: V) {
+  return validate<MutedWord & V>(v, id, hashMutedWord)
+}
+
+export function isValidMutedWord<V>(v: V) {
+  return isValid<MutedWord>(v, id, hashMutedWord)
 }
 
 export interface MutedWordsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
   /** A list of words the account owner has muted. */
   items: MutedWord[]
-  [k: string]: unknown
 }
 
-export function isMutedWordsPref(
-  v: unknown,
-): v is MutedWordsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
-} {
-  return is$typed(v, id, 'mutedWordsPref')
+const hashMutedWordsPref = 'mutedWordsPref'
+
+export function isMutedWordsPref<V>(v: V) {
+  return is$typed(v, id, hashMutedWordsPref)
+}
+
+export function validateMutedWordsPref<V>(v: V) {
+  return validate<MutedWordsPref & V>(v, id, hashMutedWordsPref)
 }
 
-export function validateMutedWordsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#mutedWordsPref`,
-    v,
-  ) as ValidationResult<MutedWordsPref>
+export function isValidMutedWordsPref<V>(v: V) {
+  return isValid<MutedWordsPref>(v, id, hashMutedWordsPref)
 }
 
 export interface HiddenPostsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
   /** A list of URIs of posts the account owner has hidden. */
   items: string[]
-  [k: string]: unknown
 }
 
-export function isHiddenPostsPref(
-  v: unknown,
-): v is HiddenPostsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
-} {
-  return is$typed(v, id, 'hiddenPostsPref')
+const hashHiddenPostsPref = 'hiddenPostsPref'
+
+export function isHiddenPostsPref<V>(v: V) {
+  return is$typed(v, id, hashHiddenPostsPref)
+}
+
+export function validateHiddenPostsPref<V>(v: V) {
+  return validate<HiddenPostsPref & V>(v, id, hashHiddenPostsPref)
 }
 
-export function validateHiddenPostsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#hiddenPostsPref`,
-    v,
-  ) as ValidationResult<HiddenPostsPref>
+export function isValidHiddenPostsPref<V>(v: V) {
+  return isValid<HiddenPostsPref>(v, id, hashHiddenPostsPref)
 }
 
 export interface LabelersPref {
+  $type?: $Type<'app.bsky.actor.defs', 'labelersPref'>
   labelers: LabelerPrefItem[]
-  [k: string]: unknown
 }
 
-export function isLabelersPref(
-  v: unknown,
-): v is LabelersPref & { $type: $Type<'app.bsky.actor.defs', 'labelersPref'> } {
-  return is$typed(v, id, 'labelersPref')
+const hashLabelersPref = 'labelersPref'
+
+export function isLabelersPref<V>(v: V) {
+  return is$typed(v, id, hashLabelersPref)
 }
 
-export function validateLabelersPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelersPref`,
-    v,
-  ) as ValidationResult<LabelersPref>
+export function validateLabelersPref<V>(v: V) {
+  return validate<LabelersPref & V>(v, id, hashLabelersPref)
+}
+
+export function isValidLabelersPref<V>(v: V) {
+  return isValid<LabelersPref>(v, id, hashLabelersPref)
 }
 
 export interface LabelerPrefItem {
+  $type?: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
   did: string
-  [k: string]: unknown
 }
 
-export function isLabelerPrefItem(
-  v: unknown,
-): v is LabelerPrefItem & {
-  $type: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
-} {
-  return is$typed(v, id, 'labelerPrefItem')
+const hashLabelerPrefItem = 'labelerPrefItem'
+
+export function isLabelerPrefItem<V>(v: V) {
+  return is$typed(v, id, hashLabelerPrefItem)
+}
+
+export function validateLabelerPrefItem<V>(v: V) {
+  return validate<LabelerPrefItem & V>(v, id, hashLabelerPrefItem)
 }
 
-export function validateLabelerPrefItem(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerPrefItem`,
-    v,
-  ) as ValidationResult<LabelerPrefItem>
+export function isValidLabelerPrefItem<V>(v: V) {
+  return isValid<LabelerPrefItem>(v, id, hashLabelerPrefItem)
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
 export interface BskyAppStatePref {
+  $type?: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
   activeProgressGuide?: BskyAppProgressGuide
   /** An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. */
   queuedNudges?: string[]
   /** Storage for NUXs the user has encountered. */
   nuxs?: Nux[]
-  [k: string]: unknown
 }
 
-export function isBskyAppStatePref(
-  v: unknown,
-): v is BskyAppStatePref & {
-  $type: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
-} {
-  return is$typed(v, id, 'bskyAppStatePref')
+const hashBskyAppStatePref = 'bskyAppStatePref'
+
+export function isBskyAppStatePref<V>(v: V) {
+  return is$typed(v, id, hashBskyAppStatePref)
+}
+
+export function validateBskyAppStatePref<V>(v: V) {
+  return validate<BskyAppStatePref & V>(v, id, hashBskyAppStatePref)
 }
 
-export function validateBskyAppStatePref(v: unknown) {
-  return lexicons.validate(
-    `${id}#bskyAppStatePref`,
-    v,
-  ) as ValidationResult<BskyAppStatePref>
+export function isValidBskyAppStatePref<V>(v: V) {
+  return isValid<BskyAppStatePref>(v, id, hashBskyAppStatePref)
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
 export interface BskyAppProgressGuide {
+  $type?: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
   guide: string
-  [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(
-  v: unknown,
-): v is BskyAppProgressGuide & {
-  $type: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
-} {
-  return is$typed(v, id, 'bskyAppProgressGuide')
+const hashBskyAppProgressGuide = 'bskyAppProgressGuide'
+
+export function isBskyAppProgressGuide<V>(v: V) {
+  return is$typed(v, id, hashBskyAppProgressGuide)
 }
 
-export function validateBskyAppProgressGuide(v: unknown) {
-  return lexicons.validate(
-    `${id}#bskyAppProgressGuide`,
-    v,
-  ) as ValidationResult<BskyAppProgressGuide>
+export function validateBskyAppProgressGuide<V>(v: V) {
+  return validate<BskyAppProgressGuide & V>(v, id, hashBskyAppProgressGuide)
+}
+
+export function isValidBskyAppProgressGuide<V>(v: V) {
+  return isValid<BskyAppProgressGuide>(v, id, hashBskyAppProgressGuide)
 }
 
 /** A new user experiences (NUX) storage object */
 export interface Nux {
+  $type?: $Type<'app.bsky.actor.defs', 'nux'>
   id: string
   completed: boolean
   /** Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters. */
   data?: string
   /** The date and time at which the NUX will expire and should be considered completed. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isNux(
-  v: unknown,
-): v is Nux & { $type: $Type<'app.bsky.actor.defs', 'nux'> } {
-  return is$typed(v, id, 'nux')
+const hashNux = 'nux'
+
+export function isNux<V>(v: V) {
+  return is$typed(v, id, hashNux)
+}
+
+export function validateNux<V>(v: V) {
+  return validate<Nux & V>(v, id, hashNux)
 }
 
-export function validateNux(v: unknown) {
-  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
+export function isValidNux<V>(v: V) {
+  return isValid<Nux>(v, id, hashNux)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
index 680cdd0967d..5137eefd413 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getPreferences'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
index 2ce818e78d1..4bac12add6a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getProfile'
 
 export interface QueryParams {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 354d8677cc1..26c6aebec00 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getProfiles'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   profiles: AppBskyActorDefs.ProfileViewDetailed[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index 1690000cb13..a06adb17957 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getSuggestions'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
index 9c71f43c191..666b6c48976 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.profile'
 
 export interface Record {
+  $type?: $Type<'app.bsky.actor.profile', 'main'>
   displayName?: string
   /** Free-form profile description text. */
   description?: string
@@ -18,21 +25,23 @@ export interface Record {
   avatar?: BlobRef
   /** Larger horizontal image to display behind profile view. */
   banner?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   joinedViaStarterPack?: ComAtprotoRepoStrongRef.Main
   pinnedPost?: ComAtprotoRepoStrongRef.Main
   createdAt?: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.actor.profile', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
index ecedca7927f..ccb8c277542 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -4,18 +4,23 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
index 5b788366ee5..ea9f15b5440 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.searchActors'
 
 export interface QueryParams {
@@ -25,7 +31,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index 754e2e8db17..e3448e6a100 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.searchActorsTypeahead'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
index 299c6f4e414..73c40d8bdcb 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
@@ -3,27 +3,34 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
+  $type?: $Type<'app.bsky.embed.defs', 'aspectRatio'>
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isAspectRatio(
-  v: unknown,
-): v is AspectRatio & { $type: $Type<'app.bsky.embed.defs', 'aspectRatio'> } {
-  return is$typed(v, id, 'aspectRatio')
+const hashAspectRatio = 'aspectRatio'
+
+export function isAspectRatio<V>(v: V) {
+  return is$typed(v, id, hashAspectRatio)
+}
+
+export function validateAspectRatio<V>(v: V) {
+  return validate<AspectRatio & V>(v, id, hashAspectRatio)
 }
 
-export function validateAspectRatio(v: unknown) {
-  return lexicons.validate(
-    `${id}#aspectRatio`,
-    v,
-  ) as ValidationResult<AspectRatio>
+export function isValidAspectRatio<V>(v: V) {
+  return isValid<AspectRatio>(v, id, hashAspectRatio)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
index c8e6fd15147..1e4a775c3fe 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
@@ -3,79 +3,96 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
+  $type?: $Type<'app.bsky.embed.external', 'main'>
   external: External
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.external', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface External {
+  $type?: $Type<'app.bsky.embed.external', 'external'>
   uri: string
   title: string
   description: string
   thumb?: BlobRef
-  [k: string]: unknown
 }
 
-export function isExternal(
-  v: unknown,
-): v is External & { $type: $Type<'app.bsky.embed.external', 'external'> } {
-  return is$typed(v, id, 'external')
+const hashExternal = 'external'
+
+export function isExternal<V>(v: V) {
+  return is$typed(v, id, hashExternal)
+}
+
+export function validateExternal<V>(v: V) {
+  return validate<External & V>(v, id, hashExternal)
 }
 
-export function validateExternal(v: unknown) {
-  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
+export function isValidExternal<V>(v: V) {
+  return isValid<External>(v, id, hashExternal)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.external', 'view'>
   external: ViewExternal
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.external', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewExternal {
+  $type?: $Type<'app.bsky.embed.external', 'viewExternal'>
   uri: string
   title: string
   description: string
   thumb?: string
-  [k: string]: unknown
 }
 
-export function isViewExternal(
-  v: unknown,
-): v is ViewExternal & {
-  $type: $Type<'app.bsky.embed.external', 'viewExternal'>
-} {
-  return is$typed(v, id, 'viewExternal')
+const hashViewExternal = 'viewExternal'
+
+export function isViewExternal<V>(v: V) {
+  return is$typed(v, id, hashViewExternal)
+}
+
+export function validateViewExternal<V>(v: V) {
+  return validate<ViewExternal & V>(v, id, hashViewExternal)
 }
 
-export function validateViewExternal(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewExternal`,
-    v,
-  ) as ValidationResult<ViewExternal>
+export function isValidViewExternal<V>(v: V) {
+  return isValid<ViewExternal>(v, id, hashViewExternal)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
index 0fd622ba6c2..d0c14d0f827 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
@@ -3,61 +3,80 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyEmbedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.images'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.images', 'main'>
   images: Image[]
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.images', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface Image {
+  $type?: $Type<'app.bsky.embed.images', 'image'>
   image: BlobRef
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isImage(
-  v: unknown,
-): v is Image & { $type: $Type<'app.bsky.embed.images', 'image'> } {
-  return is$typed(v, id, 'image')
+const hashImage = 'image'
+
+export function isImage<V>(v: V) {
+  return is$typed(v, id, hashImage)
+}
+
+export function validateImage<V>(v: V) {
+  return validate<Image & V>(v, id, hashImage)
 }
 
-export function validateImage(v: unknown) {
-  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
+export function isValidImage<V>(v: V) {
+  return isValid<Image>(v, id, hashImage)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.images', 'view'>
   images: ViewImage[]
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.images', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewImage {
+  $type?: $Type<'app.bsky.embed.images', 'viewImage'>
   /** Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. */
   thumb: string
   /** Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. */
@@ -65,15 +84,18 @@ export interface ViewImage {
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isViewImage(
-  v: unknown,
-): v is ViewImage & { $type: $Type<'app.bsky.embed.images', 'viewImage'> } {
-  return is$typed(v, id, 'viewImage')
+const hashViewImage = 'viewImage'
+
+export function isViewImage<V>(v: V) {
+  return is$typed(v, id, hashViewImage)
+}
+
+export function validateViewImage<V>(v: V) {
+  return validate<ViewImage & V>(v, id, hashViewImage)
 }
 
-export function validateViewImage(v: unknown) {
-  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
+export function isValidViewImage<V>(v: V) {
+  return isValid<ViewImage>(v, id, hashViewImage)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
index cdfe527f361..082545b5db4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
@@ -3,154 +3,168 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedDefs from '../feed/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as AppBskyLabelerDefs from '../labeler/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
-import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as AppBskyFeedDefs from '../feed/defs'
+import type * as AppBskyGraphDefs from '../graph/defs'
+import type * as AppBskyLabelerDefs from '../labeler/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyEmbedImages from './images'
+import type * as AppBskyEmbedVideo from './video'
+import type * as AppBskyEmbedExternal from './external'
+import type * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.record'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.record', 'main'>
   record: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.record', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
+}
+
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.record', 'view'>
   record:
-    | ViewRecord
-    | ViewNotFound
-    | ViewBlocked
-    | ViewDetached
-    | AppBskyFeedDefs.GeneratorView
-    | AppBskyGraphDefs.ListView
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ViewRecord>
+    | $Typed<ViewNotFound>
+    | $Typed<ViewBlocked>
+    | $Typed<ViewDetached>
+    | $Typed<AppBskyFeedDefs.GeneratorView>
+    | $Typed<AppBskyGraphDefs.ListView>
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyGraphDefs.StarterPackViewBasic>
+    | { $type: string }
+}
+
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.record', 'view'> } {
-  return is$typed(v, id, 'view')
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewRecord {
+  $type?: $Type<'app.bsky.embed.record', 'viewRecord'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
   /** The record data itself. */
-  value: {}
+  value: { [_ in string]: unknown }
   labels?: ComAtprotoLabelDefs.Label[]
   replyCount?: number
   repostCount?: number
   likeCount?: number
   quoteCount?: number
   embeds?: (
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   )[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isViewRecord(
-  v: unknown,
-): v is ViewRecord & { $type: $Type<'app.bsky.embed.record', 'viewRecord'> } {
-  return is$typed(v, id, 'viewRecord')
+const hashViewRecord = 'viewRecord'
+
+export function isViewRecord<V>(v: V) {
+  return is$typed(v, id, hashViewRecord)
+}
+
+export function validateViewRecord<V>(v: V) {
+  return validate<ViewRecord & V>(v, id, hashViewRecord)
 }
 
-export function validateViewRecord(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewRecord`,
-    v,
-  ) as ValidationResult<ViewRecord>
+export function isValidViewRecord<V>(v: V) {
+  return isValid<ViewRecord>(v, id, hashViewRecord)
 }
 
 export interface ViewNotFound {
+  $type?: $Type<'app.bsky.embed.record', 'viewNotFound'>
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isViewNotFound(
-  v: unknown,
-): v is ViewNotFound & {
-  $type: $Type<'app.bsky.embed.record', 'viewNotFound'>
-} {
-  return is$typed(v, id, 'viewNotFound')
+const hashViewNotFound = 'viewNotFound'
+
+export function isViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashViewNotFound)
+}
+
+export function validateViewNotFound<V>(v: V) {
+  return validate<ViewNotFound & V>(v, id, hashViewNotFound)
 }
 
-export function validateViewNotFound(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewNotFound`,
-    v,
-  ) as ValidationResult<ViewNotFound>
+export function isValidViewNotFound<V>(v: V) {
+  return isValid<ViewNotFound>(v, id, hashViewNotFound)
 }
 
 export interface ViewBlocked {
+  $type?: $Type<'app.bsky.embed.record', 'viewBlocked'>
   uri: string
   blocked: true
   author: AppBskyFeedDefs.BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isViewBlocked(
-  v: unknown,
-): v is ViewBlocked & { $type: $Type<'app.bsky.embed.record', 'viewBlocked'> } {
-  return is$typed(v, id, 'viewBlocked')
+const hashViewBlocked = 'viewBlocked'
+
+export function isViewBlocked<V>(v: V) {
+  return is$typed(v, id, hashViewBlocked)
 }
 
-export function validateViewBlocked(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewBlocked`,
-    v,
-  ) as ValidationResult<ViewBlocked>
+export function validateViewBlocked<V>(v: V) {
+  return validate<ViewBlocked & V>(v, id, hashViewBlocked)
+}
+
+export function isValidViewBlocked<V>(v: V) {
+  return isValid<ViewBlocked>(v, id, hashViewBlocked)
 }
 
 export interface ViewDetached {
+  $type?: $Type<'app.bsky.embed.record', 'viewDetached'>
   uri: string
   detached: true
-  [k: string]: unknown
 }
 
-export function isViewDetached(
-  v: unknown,
-): v is ViewDetached & {
-  $type: $Type<'app.bsky.embed.record', 'viewDetached'>
-} {
-  return is$typed(v, id, 'viewDetached')
+const hashViewDetached = 'viewDetached'
+
+export function isViewDetached<V>(v: V) {
+  return is$typed(v, id, hashViewDetached)
+}
+
+export function validateViewDetached<V>(v: V) {
+  return validate<ViewDetached & V>(v, id, hashViewDetached)
 }
 
-export function validateViewDetached(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewDetached`,
-    v,
-  ) as ValidationResult<ViewDetached>
+export function isValidViewDetached<V>(v: V) {
+  return isValid<ViewDetached>(v, id, hashViewDetached)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
index 9af46777257..c22958741f3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -3,51 +3,65 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyEmbedRecord from './record'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedRecord from './record'
+import type * as AppBskyEmbedImages from './images'
+import type * as AppBskyEmbedVideo from './video'
+import type * as AppBskyEmbedExternal from './external'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.recordWithMedia'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.recordWithMedia', 'main'>
   record: AppBskyEmbedRecord.Main
   media:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | { $type: string }
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.recordWithMedia', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.recordWithMedia', 'view'>
   record: AppBskyEmbedRecord.View
   media:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | { $type: string }
+}
+
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.recordWithMedia', 'view'> } {
-  return is$typed(v, id, 'view')
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
index e504f8adce9..3b8880139a1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
@@ -3,62 +3,80 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyEmbedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.video'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.video', 'main'>
   video: BlobRef
   captions?: Caption[]
   /** Alt text description of the video, for accessibility. */
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.video', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface Caption {
+  $type?: $Type<'app.bsky.embed.video', 'caption'>
   lang: string
   file: BlobRef
-  [k: string]: unknown
 }
 
-export function isCaption(
-  v: unknown,
-): v is Caption & { $type: $Type<'app.bsky.embed.video', 'caption'> } {
-  return is$typed(v, id, 'caption')
+const hashCaption = 'caption'
+
+export function isCaption<V>(v: V) {
+  return is$typed(v, id, hashCaption)
 }
 
-export function validateCaption(v: unknown) {
-  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
+export function validateCaption<V>(v: V) {
+  return validate<Caption & V>(v, id, hashCaption)
+}
+
+export function isValidCaption<V>(v: V) {
+  return isValid<Caption>(v, id, hashCaption)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.video', 'view'>
   cid: string
   playlist: string
   thumbnail?: string
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.video', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
index 573aeb47244..1269ef50b0a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
@@ -3,32 +3,39 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyGraphDefs from '../graph/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyEmbedImages from '../embed/images'
+import type * as AppBskyEmbedVideo from '../embed/video'
+import type * as AppBskyEmbedExternal from '../embed/external'
+import type * as AppBskyEmbedRecord from '../embed/record'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyGraphDefs from '../graph/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.defs'
 
 export interface PostView {
+  $type?: $Type<'app.bsky.feed.defs', 'postView'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
-  record: {}
+  record: { [_ in string]: unknown }
   embed?:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | AppBskyEmbedRecord.View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   replyCount?: number
   repostCount?: number
   likeCount?: number
@@ -37,215 +44,230 @@ export interface PostView {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   threadgate?: ThreadgateView
-  [k: string]: unknown
 }
 
-export function isPostView(
-  v: unknown,
-): v is PostView & { $type: $Type<'app.bsky.feed.defs', 'postView'> } {
-  return is$typed(v, id, 'postView')
+const hashPostView = 'postView'
+
+export function isPostView<V>(v: V) {
+  return is$typed(v, id, hashPostView)
+}
+
+export function validatePostView<V>(v: V) {
+  return validate<PostView & V>(v, id, hashPostView)
 }
 
-export function validatePostView(v: unknown) {
-  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
+export function isValidPostView<V>(v: V) {
+  return isValid<PostView>(v, id, hashPostView)
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: $Type<'app.bsky.feed.defs', 'viewerState'>
   repost?: string
   like?: string
   threadMuted?: boolean
   replyDisabled?: boolean
   embeddingDisabled?: boolean
   pinned?: boolean
-  [k: string]: unknown
 }
 
-export function isViewerState(
-  v: unknown,
-): v is ViewerState & { $type: $Type<'app.bsky.feed.defs', 'viewerState'> } {
-  return is$typed(v, id, 'viewerState')
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
+}
+
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerState`,
-    v,
-  ) as ValidationResult<ViewerState>
+export function isValidViewerState<V>(v: V) {
+  return isValid<ViewerState>(v, id, hashViewerState)
 }
 
 export interface FeedViewPost {
+  $type?: $Type<'app.bsky.feed.defs', 'feedViewPost'>
   post: PostView
   reply?: ReplyRef
-  reason?: ReasonRepost | ReasonPin | { $type: string; [k: string]: unknown }
+  reason?: $Typed<ReasonRepost> | $Typed<ReasonPin> | { $type: string }
   /** Context provided by feed generator that may be passed back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isFeedViewPost(
-  v: unknown,
-): v is FeedViewPost & { $type: $Type<'app.bsky.feed.defs', 'feedViewPost'> } {
-  return is$typed(v, id, 'feedViewPost')
+const hashFeedViewPost = 'feedViewPost'
+
+export function isFeedViewPost<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPost)
+}
+
+export function validateFeedViewPost<V>(v: V) {
+  return validate<FeedViewPost & V>(v, id, hashFeedViewPost)
 }
 
-export function validateFeedViewPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#feedViewPost`,
-    v,
-  ) as ValidationResult<FeedViewPost>
+export function isValidFeedViewPost<V>(v: V) {
+  return isValid<FeedViewPost>(v, id, hashFeedViewPost)
 }
 
 export interface ReplyRef {
+  $type?: $Type<'app.bsky.feed.defs', 'replyRef'>
   root:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   parent:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
-  [k: string]: unknown
 }
 
-export function isReplyRef(
-  v: unknown,
-): v is ReplyRef & { $type: $Type<'app.bsky.feed.defs', 'replyRef'> } {
-  return is$typed(v, id, 'replyRef')
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
+}
+
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown) {
-  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
+export function isValidReplyRef<V>(v: V) {
+  return isValid<ReplyRef>(v, id, hashReplyRef)
 }
 
 export interface ReasonRepost {
+  $type?: $Type<'app.bsky.feed.defs', 'reasonRepost'>
   by: AppBskyActorDefs.ProfileViewBasic
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isReasonRepost(
-  v: unknown,
-): v is ReasonRepost & { $type: $Type<'app.bsky.feed.defs', 'reasonRepost'> } {
-  return is$typed(v, id, 'reasonRepost')
+const hashReasonRepost = 'reasonRepost'
+
+export function isReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashReasonRepost)
+}
+
+export function validateReasonRepost<V>(v: V) {
+  return validate<ReasonRepost & V>(v, id, hashReasonRepost)
 }
 
-export function validateReasonRepost(v: unknown) {
-  return lexicons.validate(
-    `${id}#reasonRepost`,
-    v,
-  ) as ValidationResult<ReasonRepost>
+export function isValidReasonRepost<V>(v: V) {
+  return isValid<ReasonRepost>(v, id, hashReasonRepost)
 }
 
 export interface ReasonPin {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.defs', 'reasonPin'>
 }
 
-export function isReasonPin(
-  v: unknown,
-): v is ReasonPin & { $type: $Type<'app.bsky.feed.defs', 'reasonPin'> } {
-  return is$typed(v, id, 'reasonPin')
+const hashReasonPin = 'reasonPin'
+
+export function isReasonPin<V>(v: V) {
+  return is$typed(v, id, hashReasonPin)
 }
 
-export function validateReasonPin(v: unknown) {
-  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
+export function validateReasonPin<V>(v: V) {
+  return validate<ReasonPin & V>(v, id, hashReasonPin)
+}
+
+export function isValidReasonPin<V>(v: V) {
+  return isValid<ReasonPin>(v, id, hashReasonPin)
 }
 
 export interface ThreadViewPost {
+  $type?: $Type<'app.bsky.feed.defs', 'threadViewPost'>
   post: PostView
   parent?:
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   replies?: (
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
-export function isThreadViewPost(
-  v: unknown,
-): v is ThreadViewPost & {
-  $type: $Type<'app.bsky.feed.defs', 'threadViewPost'>
-} {
-  return is$typed(v, id, 'threadViewPost')
+const hashThreadViewPost = 'threadViewPost'
+
+export function isThreadViewPost<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPost)
 }
 
-export function validateThreadViewPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadViewPost`,
-    v,
-  ) as ValidationResult<ThreadViewPost>
+export function validateThreadViewPost<V>(v: V) {
+  return validate<ThreadViewPost & V>(v, id, hashThreadViewPost)
+}
+
+export function isValidThreadViewPost<V>(v: V) {
+  return isValid<ThreadViewPost>(v, id, hashThreadViewPost)
 }
 
 export interface NotFoundPost {
+  $type?: $Type<'app.bsky.feed.defs', 'notFoundPost'>
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundPost(
-  v: unknown,
-): v is NotFoundPost & { $type: $Type<'app.bsky.feed.defs', 'notFoundPost'> } {
-  return is$typed(v, id, 'notFoundPost')
+const hashNotFoundPost = 'notFoundPost'
+
+export function isNotFoundPost<V>(v: V) {
+  return is$typed(v, id, hashNotFoundPost)
+}
+
+export function validateNotFoundPost<V>(v: V) {
+  return validate<NotFoundPost & V>(v, id, hashNotFoundPost)
 }
 
-export function validateNotFoundPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#notFoundPost`,
-    v,
-  ) as ValidationResult<NotFoundPost>
+export function isValidNotFoundPost<V>(v: V) {
+  return isValid<NotFoundPost>(v, id, hashNotFoundPost)
 }
 
 export interface BlockedPost {
+  $type?: $Type<'app.bsky.feed.defs', 'blockedPost'>
   uri: string
   blocked: true
   author: BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isBlockedPost(
-  v: unknown,
-): v is BlockedPost & { $type: $Type<'app.bsky.feed.defs', 'blockedPost'> } {
-  return is$typed(v, id, 'blockedPost')
+const hashBlockedPost = 'blockedPost'
+
+export function isBlockedPost<V>(v: V) {
+  return is$typed(v, id, hashBlockedPost)
+}
+
+export function validateBlockedPost<V>(v: V) {
+  return validate<BlockedPost & V>(v, id, hashBlockedPost)
 }
 
-export function validateBlockedPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#blockedPost`,
-    v,
-  ) as ValidationResult<BlockedPost>
+export function isValidBlockedPost<V>(v: V) {
+  return isValid<BlockedPost>(v, id, hashBlockedPost)
 }
 
 export interface BlockedAuthor {
+  $type?: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
   did: string
   viewer?: AppBskyActorDefs.ViewerState
-  [k: string]: unknown
 }
 
-export function isBlockedAuthor(
-  v: unknown,
-): v is BlockedAuthor & {
-  $type: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
-} {
-  return is$typed(v, id, 'blockedAuthor')
+const hashBlockedAuthor = 'blockedAuthor'
+
+export function isBlockedAuthor<V>(v: V) {
+  return is$typed(v, id, hashBlockedAuthor)
 }
 
-export function validateBlockedAuthor(v: unknown) {
-  return lexicons.validate(
-    `${id}#blockedAuthor`,
-    v,
-  ) as ValidationResult<BlockedAuthor>
+export function validateBlockedAuthor<V>(v: V) {
+  return validate<BlockedAuthor & V>(v, id, hashBlockedAuthor)
+}
+
+export function isValidBlockedAuthor<V>(v: V) {
+  return isValid<BlockedAuthor>(v, id, hashBlockedAuthor)
 }
 
 export interface GeneratorView {
+  $type?: $Type<'app.bsky.feed.defs', 'generatorView'>
   uri: string
   cid: string
   did: string
@@ -259,133 +281,127 @@ export interface GeneratorView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: GeneratorViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isGeneratorView(
-  v: unknown,
-): v is GeneratorView & {
-  $type: $Type<'app.bsky.feed.defs', 'generatorView'>
-} {
-  return is$typed(v, id, 'generatorView')
+const hashGeneratorView = 'generatorView'
+
+export function isGeneratorView<V>(v: V) {
+  return is$typed(v, id, hashGeneratorView)
 }
 
-export function validateGeneratorView(v: unknown) {
-  return lexicons.validate(
-    `${id}#generatorView`,
-    v,
-  ) as ValidationResult<GeneratorView>
+export function validateGeneratorView<V>(v: V) {
+  return validate<GeneratorView & V>(v, id, hashGeneratorView)
+}
+
+export function isValidGeneratorView<V>(v: V) {
+  return isValid<GeneratorView>(v, id, hashGeneratorView)
 }
 
 export interface GeneratorViewerState {
+  $type?: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
   like?: string
-  [k: string]: unknown
 }
 
-export function isGeneratorViewerState(
-  v: unknown,
-): v is GeneratorViewerState & {
-  $type: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
-} {
-  return is$typed(v, id, 'generatorViewerState')
+const hashGeneratorViewerState = 'generatorViewerState'
+
+export function isGeneratorViewerState<V>(v: V) {
+  return is$typed(v, id, hashGeneratorViewerState)
+}
+
+export function validateGeneratorViewerState<V>(v: V) {
+  return validate<GeneratorViewerState & V>(v, id, hashGeneratorViewerState)
 }
 
-export function validateGeneratorViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#generatorViewerState`,
-    v,
-  ) as ValidationResult<GeneratorViewerState>
+export function isValidGeneratorViewerState<V>(v: V) {
+  return isValid<GeneratorViewerState>(v, id, hashGeneratorViewerState)
 }
 
 export interface SkeletonFeedPost {
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
   post: string
   reason?:
-    | SkeletonReasonRepost
-    | SkeletonReasonPin
-    | { $type: string; [k: string]: unknown }
+    | $Typed<SkeletonReasonRepost>
+    | $Typed<SkeletonReasonPin>
+    | { $type: string }
   /** Context that will be passed through to client and may be passed to feed generator back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(
-  v: unknown,
-): v is SkeletonFeedPost & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
-} {
-  return is$typed(v, id, 'skeletonFeedPost')
+const hashSkeletonFeedPost = 'skeletonFeedPost'
+
+export function isSkeletonFeedPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonFeedPost)
+}
+
+export function validateSkeletonFeedPost<V>(v: V) {
+  return validate<SkeletonFeedPost & V>(v, id, hashSkeletonFeedPost)
 }
 
-export function validateSkeletonFeedPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonFeedPost`,
-    v,
-  ) as ValidationResult<SkeletonFeedPost>
+export function isValidSkeletonFeedPost<V>(v: V) {
+  return isValid<SkeletonFeedPost>(v, id, hashSkeletonFeedPost)
 }
 
 export interface SkeletonReasonRepost {
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
   repost: string
-  [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(
-  v: unknown,
-): v is SkeletonReasonRepost & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
-} {
-  return is$typed(v, id, 'skeletonReasonRepost')
+const hashSkeletonReasonRepost = 'skeletonReasonRepost'
+
+export function isSkeletonReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonRepost)
+}
+
+export function validateSkeletonReasonRepost<V>(v: V) {
+  return validate<SkeletonReasonRepost & V>(v, id, hashSkeletonReasonRepost)
 }
 
-export function validateSkeletonReasonRepost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonReasonRepost`,
-    v,
-  ) as ValidationResult<SkeletonReasonRepost>
+export function isValidSkeletonReasonRepost<V>(v: V) {
+  return isValid<SkeletonReasonRepost>(v, id, hashSkeletonReasonRepost)
 }
 
 export interface SkeletonReasonPin {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
+}
+
+const hashSkeletonReasonPin = 'skeletonReasonPin'
+
+export function isSkeletonReasonPin<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonPin)
 }
 
-export function isSkeletonReasonPin(
-  v: unknown,
-): v is SkeletonReasonPin & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
-} {
-  return is$typed(v, id, 'skeletonReasonPin')
+export function validateSkeletonReasonPin<V>(v: V) {
+  return validate<SkeletonReasonPin & V>(v, id, hashSkeletonReasonPin)
 }
 
-export function validateSkeletonReasonPin(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonReasonPin`,
-    v,
-  ) as ValidationResult<SkeletonReasonPin>
+export function isValidSkeletonReasonPin<V>(v: V) {
+  return isValid<SkeletonReasonPin>(v, id, hashSkeletonReasonPin)
 }
 
 export interface ThreadgateView {
+  $type?: $Type<'app.bsky.feed.defs', 'threadgateView'>
   uri?: string
   cid?: string
-  record?: {}
+  record?: { [_ in string]: unknown }
   lists?: AppBskyGraphDefs.ListViewBasic[]
-  [k: string]: unknown
 }
 
-export function isThreadgateView(
-  v: unknown,
-): v is ThreadgateView & {
-  $type: $Type<'app.bsky.feed.defs', 'threadgateView'>
-} {
-  return is$typed(v, id, 'threadgateView')
+const hashThreadgateView = 'threadgateView'
+
+export function isThreadgateView<V>(v: V) {
+  return is$typed(v, id, hashThreadgateView)
+}
+
+export function validateThreadgateView<V>(v: V) {
+  return validate<ThreadgateView & V>(v, id, hashThreadgateView)
 }
 
-export function validateThreadgateView(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadgateView`,
-    v,
-  ) as ValidationResult<ThreadgateView>
+export function isValidThreadgateView<V>(v: V) {
+  return isValid<ThreadgateView>(v, id, hashThreadgateView)
 }
 
 export interface Interaction {
+  $type?: $Type<'app.bsky.feed.defs', 'interaction'>
   item?: string
   event?:
     | 'app.bsky.feed.defs#requestLess'
@@ -403,20 +419,20 @@ export interface Interaction {
     | (string & {})
   /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isInteraction(
-  v: unknown,
-): v is Interaction & { $type: $Type<'app.bsky.feed.defs', 'interaction'> } {
-  return is$typed(v, id, 'interaction')
+const hashInteraction = 'interaction'
+
+export function isInteraction<V>(v: V) {
+  return is$typed(v, id, hashInteraction)
+}
+
+export function validateInteraction<V>(v: V) {
+  return validate<Interaction & V>(v, id, hashInteraction)
 }
 
-export function validateInteraction(v: unknown) {
-  return lexicons.validate(
-    `${id}#interaction`,
-    v,
-  ) as ValidationResult<Interaction>
+export function isValidInteraction<V>(v: V) {
+  return isValid<Interaction>(v, id, hashInteraction)
 }
 
 /** Request that less content like the given feed item be shown in the feed */
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index b76b12a9e41..10f46121fee 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.describeFeedGenerator'
 
 export interface QueryParams {}
@@ -18,7 +24,6 @@ export interface OutputSchema {
   did: string
   feeds: Feed[]
   links?: Links
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -47,34 +52,40 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Feed {
+  $type?: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeed(
-  v: unknown,
-): v is Feed & { $type: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'> } {
-  return is$typed(v, id, 'feed')
+const hashFeed = 'feed'
+
+export function isFeed<V>(v: V) {
+  return is$typed(v, id, hashFeed)
+}
+
+export function validateFeed<V>(v: V) {
+  return validate<Feed & V>(v, id, hashFeed)
 }
 
-export function validateFeed(v: unknown) {
-  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
+export function isValidFeed<V>(v: V) {
+  return isValid<Feed>(v, id, hashFeed)
 }
 
 export interface Links {
+  $type?: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(
-  v: unknown,
-): v is Links & {
-  $type: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
-} {
-  return is$typed(v, id, 'links')
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
+}
+
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown) {
-  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
+export function isValidLinks<V>(v: V) {
+  return isValid<Links>(v, id, hashLinks)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
index 2fac60cbf6e..9c7a3fc0d62 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.generator'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.generator', 'main'>
   did: string
   displayName: string
   description?: string
@@ -18,19 +25,21 @@ export interface Record {
   avatar?: BlobRef
   /** Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions */
   acceptsInteractions?: boolean
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.generator', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index a680bebbc7e..0dfc3b407bc 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getActorFeeds'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index 5d2852087d7..ef497af6abb 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getActorLikes'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 7719ac0368a..d0f6e778bfa 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getAuthorFeed'
 
 export interface QueryParams {
@@ -30,7 +36,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
index 9224f829059..9e2fa1a11a0 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeed'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index c3981ea75b4..a742ec87ff0 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedGenerator'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export interface OutputSchema {
   isOnline: boolean
   /** Indicates whether the feed generator service is compatible with the record declaration. */
   isValid: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 4745177b4b5..43806b8e4e2 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedGenerators'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index 07eba8c59f4..abce42e5850 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedSkeleton'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.SkeletonFeedPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
index 190905772f5..629f1375eaf 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getLikes'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   likes: Like[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -56,18 +61,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Like {
+  $type?: $Type<'app.bsky.feed.getLikes', 'like'>
   indexedAt: string
   createdAt: string
   actor: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isLike(
-  v: unknown,
-): v is Like & { $type: $Type<'app.bsky.feed.getLikes', 'like'> } {
-  return is$typed(v, id, 'like')
+const hashLike = 'like'
+
+export function isLike<V>(v: V) {
+  return is$typed(v, id, hashLike)
+}
+
+export function validateLike<V>(v: V) {
+  return validate<Like & V>(v, id, hashLike)
 }
 
-export function validateLike(v: unknown) {
-  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
+export function isValidLike<V>(v: V) {
+  return isValid<Like>(v, id, hashLike)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
index a31bb6ddd62..067825731a3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getListFeed'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 444eac417c3..b9050722e41 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getPostThread'
 
 export interface QueryParams {
@@ -24,12 +30,11 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   thread:
-    | AppBskyFeedDefs.ThreadViewPost
-    | AppBskyFeedDefs.NotFoundPost
-    | AppBskyFeedDefs.BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedDefs.ThreadViewPost>
+    | $Typed<AppBskyFeedDefs.NotFoundPost>
+    | $Typed<AppBskyFeedDefs.BlockedPost>
+    | { $type: string }
   threadgate?: AppBskyFeedDefs.ThreadgateView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
index da6bf3696e2..02dffc9281c 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getPosts'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
index c71113bace2..51413c79fb1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getQuotes'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index 25bf3c8f81b..77b81b96561 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getRepostedBy'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   repostedBy: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index c34be54afdc..fbf789c54d6 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getSuggestedFeeds'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
index e3f1f0ce0bc..55b8acc1e7a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getTimeline'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
index 17f3d126a33..08ede56a096 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.like'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.like', 'main'>
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.like', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
index cc632e3e4c8..8fcd72f9ac9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
@@ -3,20 +3,27 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyEmbedImages from '../embed/images'
+import type * as AppBskyEmbedVideo from '../embed/video'
+import type * as AppBskyEmbedExternal from '../embed/external'
+import type * as AppBskyEmbedRecord from '../embed/record'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.post'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.post', 'main'>
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
   /** DEPRECATED: replaced by app.bsky.richtext.facet. */
@@ -25,17 +32,15 @@ export interface Record {
   facets?: AppBskyRichtextFacet.Main[]
   reply?: ReplyRef
   embed?:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | AppBskyEmbedRecord.Main
-    | AppBskyEmbedRecordWithMedia.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | $Typed<AppBskyEmbedRecord.Main>
+    | $Typed<AppBskyEmbedRecordWithMedia.Main>
+    | { $type: string }
   /** Indicates human language of post primary text content. */
   langs?: string[]
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   /** Additional hashtags, in addition to any included in post text and facets. */
   tags?: string[]
   /** Client-declared timestamp when this post was originally created. */
@@ -43,64 +48,80 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.post', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 export interface ReplyRef {
+  $type?: $Type<'app.bsky.feed.post', 'replyRef'>
   root: ComAtprotoRepoStrongRef.Main
   parent: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isReplyRef(
-  v: unknown,
-): v is ReplyRef & { $type: $Type<'app.bsky.feed.post', 'replyRef'> } {
-  return is$typed(v, id, 'replyRef')
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
+}
+
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown) {
-  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
+export function isValidReplyRef<V>(v: V) {
+  return isValid<ReplyRef>(v, id, hashReplyRef)
 }
 
 /** Deprecated: use facets instead. */
 export interface Entity {
+  $type?: $Type<'app.bsky.feed.post', 'entity'>
   index: TextSlice
   /** Expected values are 'mention' and 'link'. */
   type: string
   value: string
-  [k: string]: unknown
 }
 
-export function isEntity(
-  v: unknown,
-): v is Entity & { $type: $Type<'app.bsky.feed.post', 'entity'> } {
-  return is$typed(v, id, 'entity')
+const hashEntity = 'entity'
+
+export function isEntity<V>(v: V) {
+  return is$typed(v, id, hashEntity)
+}
+
+export function validateEntity<V>(v: V) {
+  return validate<Entity & V>(v, id, hashEntity)
 }
 
-export function validateEntity(v: unknown) {
-  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
+export function isValidEntity<V>(v: V) {
+  return isValid<Entity>(v, id, hashEntity)
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
 export interface TextSlice {
+  $type?: $Type<'app.bsky.feed.post', 'textSlice'>
   start: number
   end: number
-  [k: string]: unknown
 }
 
-export function isTextSlice(
-  v: unknown,
-): v is TextSlice & { $type: $Type<'app.bsky.feed.post', 'textSlice'> } {
-  return is$typed(v, id, 'textSlice')
+const hashTextSlice = 'textSlice'
+
+export function isTextSlice<V>(v: V) {
+  return is$typed(v, id, hashTextSlice)
+}
+
+export function validateTextSlice<V>(v: V) {
+  return validate<TextSlice & V>(v, id, hashTextSlice)
 }
 
-export function validateTextSlice(v: unknown) {
-  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
+export function isValidTextSlice<V>(v: V) {
+  return isValid<TextSlice>(v, id, hashTextSlice)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
index 87273460b40..25e9d32ff8c 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -3,47 +3,57 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.postgate'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.postgate', 'main'>
   createdAt: string
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
-  embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
+  embeddingRules?: ($Typed<DisableRule> | { $type: string })[]
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.postgate', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 /** Disables embedding of this post. */
 export interface DisableRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.postgate', 'disableRule'>
+}
+
+const hashDisableRule = 'disableRule'
+
+export function isDisableRule<V>(v: V) {
+  return is$typed(v, id, hashDisableRule)
 }
 
-export function isDisableRule(
-  v: unknown,
-): v is DisableRule & {
-  $type: $Type<'app.bsky.feed.postgate', 'disableRule'>
-} {
-  return is$typed(v, id, 'disableRule')
+export function validateDisableRule<V>(v: V) {
+  return validate<DisableRule & V>(v, id, hashDisableRule)
 }
 
-export function validateDisableRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#disableRule`,
-    v,
-  ) as ValidationResult<DisableRule>
+export function isValidDisableRule<V>(v: V) {
+  return isValid<DisableRule>(v, id, hashDisableRule)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
index 0f1101898d5..f51561588c7 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.repost'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.repost', 'main'>
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.repost', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 50152c309ae..cf9e9fb5d2f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.searchPosts'
 
 export interface QueryParams {
@@ -44,7 +50,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index 59bc2c698b8..13fd5759447 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -4,23 +4,26 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.sendInteractions'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   interactions: AppBskyFeedDefs.Interaction[]
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
index 696de59da87..eefa35a8dab 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -3,19 +3,26 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.threadgate', 'main'>
   /** Reference (AT-URI) to the post record. */
   post: string
   allow?: (
-    | MentionRule
-    | FollowingRule
-    | ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MentionRule>
+    | $Typed<FollowingRule>
+    | $Typed<ListRule>
+    | { $type: string }
   )[]
   createdAt: string
   /** List of hidden reply URIs. */
@@ -23,68 +30,74 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.threadgate', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 /** Allow replies from actors mentioned in your post. */
 export interface MentionRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
 }
 
-export function isMentionRule(
-  v: unknown,
-): v is MentionRule & {
-  $type: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
-} {
-  return is$typed(v, id, 'mentionRule')
+const hashMentionRule = 'mentionRule'
+
+export function isMentionRule<V>(v: V) {
+  return is$typed(v, id, hashMentionRule)
+}
+
+export function validateMentionRule<V>(v: V) {
+  return validate<MentionRule & V>(v, id, hashMentionRule)
 }
 
-export function validateMentionRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#mentionRule`,
-    v,
-  ) as ValidationResult<MentionRule>
+export function isValidMentionRule<V>(v: V) {
+  return isValid<MentionRule>(v, id, hashMentionRule)
 }
 
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.threadgate', 'followingRule'>
 }
 
-export function isFollowingRule(
-  v: unknown,
-): v is FollowingRule & {
-  $type: $Type<'app.bsky.feed.threadgate', 'followingRule'>
-} {
-  return is$typed(v, id, 'followingRule')
+const hashFollowingRule = 'followingRule'
+
+export function isFollowingRule<V>(v: V) {
+  return is$typed(v, id, hashFollowingRule)
+}
+
+export function validateFollowingRule<V>(v: V) {
+  return validate<FollowingRule & V>(v, id, hashFollowingRule)
 }
 
-export function validateFollowingRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#followingRule`,
-    v,
-  ) as ValidationResult<FollowingRule>
+export function isValidFollowingRule<V>(v: V) {
+  return isValid<FollowingRule>(v, id, hashFollowingRule)
 }
 
 /** Allow replies from actors on a list. */
 export interface ListRule {
+  $type?: $Type<'app.bsky.feed.threadgate', 'listRule'>
   list: string
-  [k: string]: unknown
 }
 
-export function isListRule(
-  v: unknown,
-): v is ListRule & { $type: $Type<'app.bsky.feed.threadgate', 'listRule'> } {
-  return is$typed(v, id, 'listRule')
+const hashListRule = 'listRule'
+
+export function isListRule<V>(v: V) {
+  return is$typed(v, id, hashListRule)
+}
+
+export function validateListRule<V>(v: V) {
+  return validate<ListRule & V>(v, id, hashListRule)
 }
 
-export function validateListRule(v: unknown) {
-  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
+export function isValidListRule<V>(v: V) {
+  return isValid<ListRule>(v, id, hashListRule)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
index 167afdf2f9b..c10702a4403 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.block'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.block', 'main'>
   /** DID of the account to be blocked. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.block', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
index 44d1962de5e..52c8471a7d8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
@@ -3,16 +3,23 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyFeedDefs from '../feed/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyFeedDefs from '../feed/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.defs'
 
 export interface ListViewBasic {
+  $type?: $Type<'app.bsky.graph.defs', 'listViewBasic'>
   uri: string
   cid: string
   name: string
@@ -22,25 +29,24 @@ export interface ListViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt?: string
-  [k: string]: unknown
 }
 
-export function isListViewBasic(
-  v: unknown,
-): v is ListViewBasic & {
-  $type: $Type<'app.bsky.graph.defs', 'listViewBasic'>
-} {
-  return is$typed(v, id, 'listViewBasic')
+const hashListViewBasic = 'listViewBasic'
+
+export function isListViewBasic<V>(v: V) {
+  return is$typed(v, id, hashListViewBasic)
+}
+
+export function validateListViewBasic<V>(v: V) {
+  return validate<ListViewBasic & V>(v, id, hashListViewBasic)
 }
 
-export function validateListViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#listViewBasic`,
-    v,
-  ) as ValidationResult<ListViewBasic>
+export function isValidListViewBasic<V>(v: V) {
+  return isValid<ListViewBasic>(v, id, hashListViewBasic)
 }
 
 export interface ListView {
+  $type?: $Type<'app.bsky.graph.defs', 'listView'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -53,42 +59,47 @@ export interface ListView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isListView(
-  v: unknown,
-): v is ListView & { $type: $Type<'app.bsky.graph.defs', 'listView'> } {
-  return is$typed(v, id, 'listView')
+const hashListView = 'listView'
+
+export function isListView<V>(v: V) {
+  return is$typed(v, id, hashListView)
+}
+
+export function validateListView<V>(v: V) {
+  return validate<ListView & V>(v, id, hashListView)
 }
 
-export function validateListView(v: unknown) {
-  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
+export function isValidListView<V>(v: V) {
+  return isValid<ListView>(v, id, hashListView)
 }
 
 export interface ListItemView {
+  $type?: $Type<'app.bsky.graph.defs', 'listItemView'>
   uri: string
   subject: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isListItemView(
-  v: unknown,
-): v is ListItemView & { $type: $Type<'app.bsky.graph.defs', 'listItemView'> } {
-  return is$typed(v, id, 'listItemView')
+const hashListItemView = 'listItemView'
+
+export function isListItemView<V>(v: V) {
+  return is$typed(v, id, hashListItemView)
+}
+
+export function validateListItemView<V>(v: V) {
+  return validate<ListItemView & V>(v, id, hashListItemView)
 }
 
-export function validateListItemView(v: unknown) {
-  return lexicons.validate(
-    `${id}#listItemView`,
-    v,
-  ) as ValidationResult<ListItemView>
+export function isValidListItemView<V>(v: V) {
+  return isValid<ListItemView>(v, id, hashListItemView)
 }
 
 export interface StarterPackView {
+  $type?: $Type<'app.bsky.graph.defs', 'starterPackView'>
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   list?: ListViewBasic
   listItemsSample?: ListItemView[]
@@ -97,50 +108,47 @@ export interface StarterPackView {
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackView(
-  v: unknown,
-): v is StarterPackView & {
-  $type: $Type<'app.bsky.graph.defs', 'starterPackView'>
-} {
-  return is$typed(v, id, 'starterPackView')
+const hashStarterPackView = 'starterPackView'
+
+export function isStarterPackView<V>(v: V) {
+  return is$typed(v, id, hashStarterPackView)
+}
+
+export function validateStarterPackView<V>(v: V) {
+  return validate<StarterPackView & V>(v, id, hashStarterPackView)
 }
 
-export function validateStarterPackView(v: unknown) {
-  return lexicons.validate(
-    `${id}#starterPackView`,
-    v,
-  ) as ValidationResult<StarterPackView>
+export function isValidStarterPackView<V>(v: V) {
+  return isValid<StarterPackView>(v, id, hashStarterPackView)
 }
 
 export interface StarterPackViewBasic {
+  $type?: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   listItemCount?: number
   joinedWeekCount?: number
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(
-  v: unknown,
-): v is StarterPackViewBasic & {
-  $type: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
-} {
-  return is$typed(v, id, 'starterPackViewBasic')
+const hashStarterPackViewBasic = 'starterPackViewBasic'
+
+export function isStarterPackViewBasic<V>(v: V) {
+  return is$typed(v, id, hashStarterPackViewBasic)
+}
+
+export function validateStarterPackViewBasic<V>(v: V) {
+  return validate<StarterPackViewBasic & V>(v, id, hashStarterPackViewBasic)
 }
 
-export function validateStarterPackViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#starterPackViewBasic`,
-    v,
-  ) as ValidationResult<StarterPackViewBasic>
+export function isValidStarterPackViewBasic<V>(v: V) {
+  return isValid<StarterPackViewBasic>(v, id, hashStarterPackViewBasic)
 }
 
 export type ListPurpose =
@@ -157,67 +165,66 @@ export const CURATELIST = `${id}#curatelist`
 export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
+  $type?: $Type<'app.bsky.graph.defs', 'listViewerState'>
   muted?: boolean
   blocked?: string
-  [k: string]: unknown
 }
 
-export function isListViewerState(
-  v: unknown,
-): v is ListViewerState & {
-  $type: $Type<'app.bsky.graph.defs', 'listViewerState'>
-} {
-  return is$typed(v, id, 'listViewerState')
+const hashListViewerState = 'listViewerState'
+
+export function isListViewerState<V>(v: V) {
+  return is$typed(v, id, hashListViewerState)
+}
+
+export function validateListViewerState<V>(v: V) {
+  return validate<ListViewerState & V>(v, id, hashListViewerState)
 }
 
-export function validateListViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#listViewerState`,
-    v,
-  ) as ValidationResult<ListViewerState>
+export function isValidListViewerState<V>(v: V) {
+  return isValid<ListViewerState>(v, id, hashListViewerState)
 }
 
 /** indicates that a handle or DID could not be resolved */
 export interface NotFoundActor {
+  $type?: $Type<'app.bsky.graph.defs', 'notFoundActor'>
   actor: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundActor(
-  v: unknown,
-): v is NotFoundActor & {
-  $type: $Type<'app.bsky.graph.defs', 'notFoundActor'>
-} {
-  return is$typed(v, id, 'notFoundActor')
+const hashNotFoundActor = 'notFoundActor'
+
+export function isNotFoundActor<V>(v: V) {
+  return is$typed(v, id, hashNotFoundActor)
+}
+
+export function validateNotFoundActor<V>(v: V) {
+  return validate<NotFoundActor & V>(v, id, hashNotFoundActor)
 }
 
-export function validateNotFoundActor(v: unknown) {
-  return lexicons.validate(
-    `${id}#notFoundActor`,
-    v,
-  ) as ValidationResult<NotFoundActor>
+export function isValidNotFoundActor<V>(v: V) {
+  return isValid<NotFoundActor>(v, id, hashNotFoundActor)
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
 export interface Relationship {
+  $type?: $Type<'app.bsky.graph.defs', 'relationship'>
   did: string
   /** if the actor follows this DID, this is the AT-URI of the follow record */
   following?: string
   /** if the actor is followed by this DID, contains the AT-URI of the follow record */
   followedBy?: string
-  [k: string]: unknown
 }
 
-export function isRelationship(
-  v: unknown,
-): v is Relationship & { $type: $Type<'app.bsky.graph.defs', 'relationship'> } {
-  return is$typed(v, id, 'relationship')
+const hashRelationship = 'relationship'
+
+export function isRelationship<V>(v: V) {
+  return is$typed(v, id, hashRelationship)
+}
+
+export function validateRelationship<V>(v: V) {
+  return validate<Relationship & V>(v, id, hashRelationship)
 }
 
-export function validateRelationship(v: unknown) {
-  return lexicons.validate(
-    `${id}#relationship`,
-    v,
-  ) as ValidationResult<Relationship>
+export function isValidRelationship<V>(v: V) {
+  return isValid<Relationship>(v, id, hashRelationship)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
index bb0f2d2dc3a..28c81906d31 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
@@ -3,23 +3,34 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.follow'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.follow', 'main'>
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.follow', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index ee9a8af4999..ba38795bf41 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getActorStarterPacks'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
index d353dc99267..5f4be16f2e8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getBlocks'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blocks: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
index a44fe4c7ca9..ea5db286f46 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getFollowers'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
index af3b8214783..c6455506ab7 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getFollows'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   follows: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index 0cdb01d99df..81669d4e12a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getKnownFollowers'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
index 444d463f7be..708ce31ce8e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getList'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export interface OutputSchema {
   cursor?: string
   list: AppBskyGraphDefs.ListView
   items: AppBskyGraphDefs.ListItemView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 2828969d77c..a754c83658f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getListBlocks'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 25fc22a45e7..e4f376d20cf 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getListMutes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
index 04c1e929899..e28505a47dd 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getLists'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
index fcfbadd3154..9b0d6c83b3b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getMutes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   mutes: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
index b169bc9de7e..e05732c84ad 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getRelationships'
 
 export interface QueryParams {
@@ -23,11 +29,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   actor?: string
   relationships: (
-    | AppBskyGraphDefs.Relationship
-    | AppBskyGraphDefs.NotFoundActor
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyGraphDefs.Relationship>
+    | $Typed<AppBskyGraphDefs.NotFoundActor>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index 906e412e1c5..69a882c3852 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getStarterPack'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPack: AppBskyGraphDefs.StarterPackView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 829cfa6bc94..bb7cfafe4c5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getStarterPacks'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index 7a59fd5716d..e5f1148f4f5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getSuggestedFollowsByActor'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export interface OutputSchema {
   suggestions: AppBskyActorDefs.ProfileView[]
   /** If true, response has fallen-back to generic results, and is not scoped using relativeToDid */
   isFallback?: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
index 4fc99ad59d4..97bf1c00559 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
@@ -3,34 +3,43 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyGraphDefs from './defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.list'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.list', 'main'>
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
   name: string
   description?: string
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.list', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
index e159ed9b6d1..6ebd36c4cb3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.listblock'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.listblock', 'main'>
   /** Reference (AT-URI) to the mod list record. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.listblock', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
index 164196cfc25..a3b7efb0eb1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.listitem'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.listitem', 'main'>
   /** The account which is included on the list. */
   subject: string
   /** Reference (AT-URI) to the list record (app.bsky.graph.list). */
@@ -17,12 +24,16 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.listitem', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
index aa9b7a1b950..7136480f8f3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteActor'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 0acc1da0dc2..30dabadfd2f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteActorList'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
index 552bff9572f..efb5dab9617 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteThread'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index 643bb579fe1..e7be70760c7 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.searchStarterPacks'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
index d7cb5b48930..66abf07fd50 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../richtext/facet'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.starterpack'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.starterpack', 'main'>
   /** Display name for starter pack; can not be empty. */
   name: string
   description?: string
@@ -21,27 +28,35 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.starterpack', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 export interface FeedItem {
+  $type?: $Type<'app.bsky.graph.starterpack', 'feedItem'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeedItem(
-  v: unknown,
-): v is FeedItem & { $type: $Type<'app.bsky.graph.starterpack', 'feedItem'> } {
-  return is$typed(v, id, 'feedItem')
+const hashFeedItem = 'feedItem'
+
+export function isFeedItem<V>(v: V) {
+  return is$typed(v, id, hashFeedItem)
+}
+
+export function validateFeedItem<V>(v: V) {
+  return validate<FeedItem & V>(v, id, hashFeedItem)
 }
 
-export function validateFeedItem(v: unknown) {
-  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
+export function isValidFeedItem<V>(v: V) {
+  return isValid<FeedItem>(v, id, hashFeedItem)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index 74e02903ed7..21396a46451 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteActor'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 44fc69490f8..f25697e65ea 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteActorList'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 135db7e8e4f..d657979501c 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteThread'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
index b59c8227d10..e0f2f945b4e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.defs'
 
 export interface LabelerView {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerView'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -18,23 +25,24 @@ export interface LabelerView {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerView(
-  v: unknown,
-): v is LabelerView & { $type: $Type<'app.bsky.labeler.defs', 'labelerView'> } {
-  return is$typed(v, id, 'labelerView')
+const hashLabelerView = 'labelerView'
+
+export function isLabelerView<V>(v: V) {
+  return is$typed(v, id, hashLabelerView)
+}
+
+export function validateLabelerView<V>(v: V) {
+  return validate<LabelerView & V>(v, id, hashLabelerView)
 }
 
-export function validateLabelerView(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerView`,
-    v,
-  ) as ValidationResult<LabelerView>
+export function isValidLabelerView<V>(v: V) {
+  return isValid<LabelerView>(v, id, hashLabelerView)
 }
 
 export interface LabelerViewDetailed {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -43,63 +51,59 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(
-  v: unknown,
-): v is LabelerViewDetailed & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
-} {
-  return is$typed(v, id, 'labelerViewDetailed')
+const hashLabelerViewDetailed = 'labelerViewDetailed'
+
+export function isLabelerViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewDetailed)
+}
+
+export function validateLabelerViewDetailed<V>(v: V) {
+  return validate<LabelerViewDetailed & V>(v, id, hashLabelerViewDetailed)
 }
 
-export function validateLabelerViewDetailed(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerViewDetailed`,
-    v,
-  ) as ValidationResult<LabelerViewDetailed>
+export function isValidLabelerViewDetailed<V>(v: V) {
+  return isValid<LabelerViewDetailed>(v, id, hashLabelerViewDetailed)
 }
 
 export interface LabelerViewerState {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
   like?: string
-  [k: string]: unknown
 }
 
-export function isLabelerViewerState(
-  v: unknown,
-): v is LabelerViewerState & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
-} {
-  return is$typed(v, id, 'labelerViewerState')
+const hashLabelerViewerState = 'labelerViewerState'
+
+export function isLabelerViewerState<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewerState)
+}
+
+export function validateLabelerViewerState<V>(v: V) {
+  return validate<LabelerViewerState & V>(v, id, hashLabelerViewerState)
 }
 
-export function validateLabelerViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerViewerState`,
-    v,
-  ) as ValidationResult<LabelerViewerState>
+export function isValidLabelerViewerState<V>(v: V) {
+  return isValid<LabelerViewerState>(v, id, hashLabelerViewerState)
 }
 
 export interface LabelerPolicies {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
   /** The label values which this labeler publishes. May include global or custom labels. */
   labelValues: ComAtprotoLabelDefs.LabelValue[]
   /** Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. */
   labelValueDefinitions?: ComAtprotoLabelDefs.LabelValueDefinition[]
-  [k: string]: unknown
 }
 
-export function isLabelerPolicies(
-  v: unknown,
-): v is LabelerPolicies & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
-} {
-  return is$typed(v, id, 'labelerPolicies')
+const hashLabelerPolicies = 'labelerPolicies'
+
+export function isLabelerPolicies<V>(v: V) {
+  return is$typed(v, id, hashLabelerPolicies)
+}
+
+export function validateLabelerPolicies<V>(v: V) {
+  return validate<LabelerPolicies & V>(v, id, hashLabelerPolicies)
 }
 
-export function validateLabelerPolicies(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerPolicies`,
-    v,
-  ) as ValidationResult<LabelerPolicies>
+export function isValidLabelerPolicies<V>(v: V) {
+  return isValid<LabelerPolicies>(v, id, hashLabelerPolicies)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
index c80da11262f..ec8efbba356 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyLabelerDefs from './defs'
+import type * as AppBskyLabelerDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.getServices'
 
 export interface QueryParams {
@@ -20,11 +26,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   views: (
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyLabelerDefs.LabelerViewDetailed>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
index 0abc40dc8d1..5973c2fd285 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
@@ -3,28 +3,37 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyLabelerDefs from './defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.service'
 
 export interface Record {
+  $type?: $Type<'app.bsky.labeler.service', 'main'>
   policies: AppBskyLabelerDefs.LabelerPolicies
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.labeler.service', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index d52044a760b..658b44090a5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.getUnreadCount'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   count: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 19a2dc35fb0..69e705fcf3c 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -4,12 +4,18 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.listNotifications'
 
 export interface QueryParams {
@@ -28,7 +34,6 @@ export interface OutputSchema {
   notifications: Notification[]
   priority?: boolean
   seenAt?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -57,6 +62,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Notification {
+  $type?: $Type<'app.bsky.notification.listNotifications', 'notification'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileView
@@ -71,24 +77,22 @@ export interface Notification {
     | 'starterpack-joined'
     | (string & {})
   reasonSubject?: string
-  record: {}
+  record: { [_ in string]: unknown }
   isRead: boolean
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isNotification(
-  v: unknown,
-): v is Notification & {
-  $type: $Type<'app.bsky.notification.listNotifications', 'notification'>
-} {
-  return is$typed(v, id, 'notification')
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
+}
+
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
 }
 
-export function validateNotification(v: unknown) {
-  return lexicons.validate(
-    `${id}#notification`,
-    v,
-  ) as ValidationResult<Notification>
+export function isValidNotification<V>(v: V) {
+  return isValid<Notification>(v, id, hashNotification)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 0b5a9f066ad..f741da70ab3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   priority: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
index 516babda578..8fe65463fed 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.registerPush'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   token: string
   platform: 'ios' | 'android' | 'web' | (string & {})
   appId: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 6312ceeaa15..7e374302fdd 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.updateSeen'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   seenAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts b/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
index 0a14274b608..a73bef3f85a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -3,89 +3,115 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
+  $type?: $Type<'app.bsky.richtext.facet', 'main'>
   index: ByteSlice
-  features: (Mention | Link | Tag | { $type: string; [k: string]: unknown })[]
-  [k: string]: unknown
+  features: ($Typed<Mention> | $Typed<Link> | $Typed<Tag> | { $type: string })[]
+}
+
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.richtext.facet', 'main'> } {
-  return is$typed(v, id, 'main')
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
 export interface Mention {
+  $type?: $Type<'app.bsky.richtext.facet', 'mention'>
   did: string
-  [k: string]: unknown
 }
 
-export function isMention(
-  v: unknown,
-): v is Mention & { $type: $Type<'app.bsky.richtext.facet', 'mention'> } {
-  return is$typed(v, id, 'mention')
+const hashMention = 'mention'
+
+export function isMention<V>(v: V) {
+  return is$typed(v, id, hashMention)
+}
+
+export function validateMention<V>(v: V) {
+  return validate<Mention & V>(v, id, hashMention)
 }
 
-export function validateMention(v: unknown) {
-  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
+export function isValidMention<V>(v: V) {
+  return isValid<Mention>(v, id, hashMention)
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
 export interface Link {
+  $type?: $Type<'app.bsky.richtext.facet', 'link'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isLink(
-  v: unknown,
-): v is Link & { $type: $Type<'app.bsky.richtext.facet', 'link'> } {
-  return is$typed(v, id, 'link')
+const hashLink = 'link'
+
+export function isLink<V>(v: V) {
+  return is$typed(v, id, hashLink)
+}
+
+export function validateLink<V>(v: V) {
+  return validate<Link & V>(v, id, hashLink)
 }
 
-export function validateLink(v: unknown) {
-  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
+export function isValidLink<V>(v: V) {
+  return isValid<Link>(v, id, hashLink)
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
 export interface Tag {
+  $type?: $Type<'app.bsky.richtext.facet', 'tag'>
   tag: string
-  [k: string]: unknown
 }
 
-export function isTag(
-  v: unknown,
-): v is Tag & { $type: $Type<'app.bsky.richtext.facet', 'tag'> } {
-  return is$typed(v, id, 'tag')
+const hashTag = 'tag'
+
+export function isTag<V>(v: V) {
+  return is$typed(v, id, hashTag)
+}
+
+export function validateTag<V>(v: V) {
+  return validate<Tag & V>(v, id, hashTag)
 }
 
-export function validateTag(v: unknown) {
-  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
+export function isValidTag<V>(v: V) {
+  return isValid<Tag>(v, id, hashTag)
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
 export interface ByteSlice {
+  $type?: $Type<'app.bsky.richtext.facet', 'byteSlice'>
   byteStart: number
   byteEnd: number
-  [k: string]: unknown
 }
 
-export function isByteSlice(
-  v: unknown,
-): v is ByteSlice & { $type: $Type<'app.bsky.richtext.facet', 'byteSlice'> } {
-  return is$typed(v, id, 'byteSlice')
+const hashByteSlice = 'byteSlice'
+
+export function isByteSlice<V>(v: V) {
+  return is$typed(v, id, hashByteSlice)
+}
+
+export function validateByteSlice<V>(v: V) {
+  return validate<ByteSlice & V>(v, id, hashByteSlice)
 }
 
-export function validateByteSlice(v: unknown) {
-  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
+export function isValidByteSlice<V>(v: V) {
+  return isValid<ByteSlice>(v, id, hashByteSlice)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
index 415c1c30867..a4286c5222e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -3,90 +3,100 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(
-  v: unknown,
-): v is SkeletonSearchPost & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
-} {
-  return is$typed(v, id, 'skeletonSearchPost')
+const hashSkeletonSearchPost = 'skeletonSearchPost'
+
+export function isSkeletonSearchPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchPost)
 }
 
-export function validateSkeletonSearchPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchPost`,
-    v,
-  ) as ValidationResult<SkeletonSearchPost>
+export function validateSkeletonSearchPost<V>(v: V) {
+  return validate<SkeletonSearchPost & V>(v, id, hashSkeletonSearchPost)
+}
+
+export function isValidSkeletonSearchPost<V>(v: V) {
+  return isValid<SkeletonSearchPost>(v, id, hashSkeletonSearchPost)
 }
 
 export interface SkeletonSearchActor {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
   did: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(
-  v: unknown,
-): v is SkeletonSearchActor & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
-} {
-  return is$typed(v, id, 'skeletonSearchActor')
+const hashSkeletonSearchActor = 'skeletonSearchActor'
+
+export function isSkeletonSearchActor<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchActor)
 }
 
-export function validateSkeletonSearchActor(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchActor`,
-    v,
-  ) as ValidationResult<SkeletonSearchActor>
+export function validateSkeletonSearchActor<V>(v: V) {
+  return validate<SkeletonSearchActor & V>(v, id, hashSkeletonSearchActor)
+}
+
+export function isValidSkeletonSearchActor<V>(v: V) {
+  return isValid<SkeletonSearchActor>(v, id, hashSkeletonSearchActor)
 }
 
 export interface SkeletonSearchStarterPack {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchStarterPack(
-  v: unknown,
-): v is SkeletonSearchStarterPack & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
-} {
-  return is$typed(v, id, 'skeletonSearchStarterPack')
+const hashSkeletonSearchStarterPack = 'skeletonSearchStarterPack'
+
+export function isSkeletonSearchStarterPack<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchStarterPack)
+}
+
+export function validateSkeletonSearchStarterPack<V>(v: V) {
+  return validate<SkeletonSearchStarterPack & V>(
+    v,
+    id,
+    hashSkeletonSearchStarterPack,
+  )
 }
 
-export function validateSkeletonSearchStarterPack(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchStarterPack`,
+export function isValidSkeletonSearchStarterPack<V>(v: V) {
+  return isValid<SkeletonSearchStarterPack>(
     v,
-  ) as ValidationResult<SkeletonSearchStarterPack>
+    id,
+    hashSkeletonSearchStarterPack,
+  )
 }
 
 export interface TrendingTopic {
+  $type?: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
   topic: string
   displayName?: string
   description?: string
   link: string
-  [k: string]: unknown
 }
 
-export function isTrendingTopic(
-  v: unknown,
-): v is TrendingTopic & {
-  $type: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
-} {
-  return is$typed(v, id, 'trendingTopic')
+const hashTrendingTopic = 'trendingTopic'
+
+export function isTrendingTopic<V>(v: V) {
+  return is$typed(v, id, hashTrendingTopic)
 }
 
-export function validateTrendingTopic(v: unknown) {
-  return lexicons.validate(
-    `${id}#trendingTopic`,
-    v,
-  ) as ValidationResult<TrendingTopic>
+export function validateTrendingTopic<V>(v: V) {
+  return validate<TrendingTopic & V>(v, id, hashTrendingTopic)
+}
+
+export function isValidTrendingTopic<V>(v: V) {
+  return isValid<TrendingTopic>(v, id, hashTrendingTopic)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index b9e45fd96ce..ee024aff1b5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getConfig'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   checkEmailConfirmed?: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 20a45bc5992..d2abd861e22 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from '../feed/defs'
+import type * as AppBskyFeedDefs from '../feed/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getPopularFeedGenerators'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index 579973036a5..6a58219d23f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
   /** DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer. */
   relativeToDid?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index 371350940f3..d5afe19e3bb 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getTaggedSuggestions'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   suggestions: Suggestion[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -45,23 +50,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Suggestion {
+  $type?: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
   tag: string
   subjectType: 'actor' | 'feed' | (string & {})
   subject: string
-  [k: string]: unknown
 }
 
-export function isSuggestion(
-  v: unknown,
-): v is Suggestion & {
-  $type: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
-} {
-  return is$typed(v, id, 'suggestion')
+const hashSuggestion = 'suggestion'
+
+export function isSuggestion<V>(v: V) {
+  return is$typed(v, id, hashSuggestion)
+}
+
+export function validateSuggestion<V>(v: V) {
+  return validate<Suggestion & V>(v, id, hashSuggestion)
 }
 
-export function validateSuggestion(v: unknown) {
-  return lexicons.validate(
-    `${id}#suggestion`,
-    v,
-  ) as ValidationResult<Suggestion>
+export function isValidSuggestion<V>(v: V) {
+  return isValid<Suggestion>(v, id, hashSuggestion)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 47a4ac1a5b0..c1eb890b669 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getTrendingTopics'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   topics: AppBskyUnspeccedDefs.TrendingTopic[]
   suggested: AppBskyUnspeccedDefs.TrendingTopic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index b4206a089b9..a9c27fbef04 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchActorsSkeleton'
 
 export interface QueryParams {
@@ -30,7 +36,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index 16b2ff87428..9f5cd4aed0f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchPostsSkeleton'
 
 export interface QueryParams {
@@ -46,7 +52,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyUnspeccedDefs.SkeletonSearchPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index 6927713a2e4..db8a5a27aef 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
 
 export interface QueryParams {
@@ -28,7 +34,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   starterPacks: AppBskyUnspeccedDefs.SkeletonSearchStarterPack[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
index 7b82931c46c..93ed16829ca 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
+  $type?: $Type<'app.bsky.video.defs', 'jobStatus'>
   jobId: string
   did: string
   /** The state of the video processing job. All values not listed as a known value indicate that the job is in process. */
@@ -18,15 +25,18 @@ export interface JobStatus {
   blob?: BlobRef
   error?: string
   message?: string
-  [k: string]: unknown
 }
 
-export function isJobStatus(
-  v: unknown,
-): v is JobStatus & { $type: $Type<'app.bsky.video.defs', 'jobStatus'> } {
-  return is$typed(v, id, 'jobStatus')
+const hashJobStatus = 'jobStatus'
+
+export function isJobStatus<V>(v: V) {
+  return is$typed(v, id, hashJobStatus)
+}
+
+export function validateJobStatus<V>(v: V) {
+  return validate<JobStatus & V>(v, id, hashJobStatus)
 }
 
-export function validateJobStatus(v: unknown) {
-  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
+export function isValidJobStatus<V>(v: V) {
+  return isValid<JobStatus>(v, id, hashJobStatus)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 6cea4453ace..71786a6b24d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.getJobStatus'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index e1a2c8a12f8..474a2917384 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.getUploadLimits'
 
 export interface QueryParams {}
@@ -20,7 +26,6 @@ export interface OutputSchema {
   remainingDailyBytes?: number
   message?: string
   error?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
index 85e0beeb811..da8834bc9cd 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -5,11 +5,17 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.uploadVideo'
 
 export interface QueryParams {}
@@ -18,7 +24,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
index 454bd9edf6f..745d97fc50a 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -3,22 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
+  $type?: $Type<'chat.bsky.actor.declaration', 'main'>
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'chat.bsky.actor.declaration', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
index 3b1627f0800..0a12bbedea1 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
   did: string
   handle: string
   displayName?: string
@@ -20,20 +27,18 @@ export interface ProfileViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   /** Set to true when the actor cannot actively participate in converations */
   chatDisabled?: boolean
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(
-  v: unknown,
-): v is ProfileViewBasic & {
-  $type: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
-} {
-  return is$typed(v, id, 'profileViewBasic')
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
+}
+
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewBasic`,
-    v,
-  ) as ValidationResult<ProfileViewBasic>
+export function isValidProfileViewBasic<V>(v: V) {
+  return isValid<ProfileViewBasic>(v, id, hashProfileViewBasic)
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index c45ee77d22e..8de7d41b2cd 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -4,19 +4,23 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.deleteAccount'
 
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export type HandlerInput = undefined
 
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index aa37fb7e366..6768e9f518b 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.exportAccountData'
 
 export interface QueryParams {}
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
index f7adb51d238..1b1a357aabc 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -3,237 +3,236 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
-import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
-import * as ChatBskyActorDefs from '../actor/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
+import type * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
+import type * as ChatBskyActorDefs from '../actor/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.defs'
 
 export interface MessageRef {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageRef'>
   did: string
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
-export function isMessageRef(
-  v: unknown,
-): v is MessageRef & { $type: $Type<'chat.bsky.convo.defs', 'messageRef'> } {
-  return is$typed(v, id, 'messageRef')
+const hashMessageRef = 'messageRef'
+
+export function isMessageRef<V>(v: V) {
+  return is$typed(v, id, hashMessageRef)
 }
 
-export function validateMessageRef(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageRef`,
-    v,
-  ) as ValidationResult<MessageRef>
+export function validateMessageRef<V>(v: V) {
+  return validate<MessageRef & V>(v, id, hashMessageRef)
+}
+
+export function isValidMessageRef<V>(v: V) {
+  return isValid<MessageRef>(v, id, hashMessageRef)
 }
 
 export interface MessageInput {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageInput'>
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.Main | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  embed?: $Typed<AppBskyEmbedRecord.Main> | { $type: string }
 }
 
-export function isMessageInput(
-  v: unknown,
-): v is MessageInput & {
-  $type: $Type<'chat.bsky.convo.defs', 'messageInput'>
-} {
-  return is$typed(v, id, 'messageInput')
+const hashMessageInput = 'messageInput'
+
+export function isMessageInput<V>(v: V) {
+  return is$typed(v, id, hashMessageInput)
 }
 
-export function validateMessageInput(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageInput`,
-    v,
-  ) as ValidationResult<MessageInput>
+export function validateMessageInput<V>(v: V) {
+  return validate<MessageInput & V>(v, id, hashMessageInput)
+}
+
+export function isValidMessageInput<V>(v: V) {
+  return isValid<MessageInput>(v, id, hashMessageInput)
 }
 
 export interface MessageView {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageView'>
   id: string
   rev: string
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.View | { $type: string; [k: string]: unknown }
+  embed?: $Typed<AppBskyEmbedRecord.View> | { $type: string }
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isMessageView(
-  v: unknown,
-): v is MessageView & { $type: $Type<'chat.bsky.convo.defs', 'messageView'> } {
-  return is$typed(v, id, 'messageView')
+const hashMessageView = 'messageView'
+
+export function isMessageView<V>(v: V) {
+  return is$typed(v, id, hashMessageView)
+}
+
+export function validateMessageView<V>(v: V) {
+  return validate<MessageView & V>(v, id, hashMessageView)
 }
 
-export function validateMessageView(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageView`,
-    v,
-  ) as ValidationResult<MessageView>
+export function isValidMessageView<V>(v: V) {
+  return isValid<MessageView>(v, id, hashMessageView)
 }
 
 export interface DeletedMessageView {
+  $type?: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
   id: string
   rev: string
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isDeletedMessageView(
-  v: unknown,
-): v is DeletedMessageView & {
-  $type: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
-} {
-  return is$typed(v, id, 'deletedMessageView')
+const hashDeletedMessageView = 'deletedMessageView'
+
+export function isDeletedMessageView<V>(v: V) {
+  return is$typed(v, id, hashDeletedMessageView)
 }
 
-export function validateDeletedMessageView(v: unknown) {
-  return lexicons.validate(
-    `${id}#deletedMessageView`,
-    v,
-  ) as ValidationResult<DeletedMessageView>
+export function validateDeletedMessageView<V>(v: V) {
+  return validate<DeletedMessageView & V>(v, id, hashDeletedMessageView)
+}
+
+export function isValidDeletedMessageView<V>(v: V) {
+  return isValid<DeletedMessageView>(v, id, hashDeletedMessageView)
 }
 
 export interface MessageViewSender {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
   did: string
-  [k: string]: unknown
 }
 
-export function isMessageViewSender(
-  v: unknown,
-): v is MessageViewSender & {
-  $type: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
-} {
-  return is$typed(v, id, 'messageViewSender')
+const hashMessageViewSender = 'messageViewSender'
+
+export function isMessageViewSender<V>(v: V) {
+  return is$typed(v, id, hashMessageViewSender)
 }
 
-export function validateMessageViewSender(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageViewSender`,
-    v,
-  ) as ValidationResult<MessageViewSender>
+export function validateMessageViewSender<V>(v: V) {
+  return validate<MessageViewSender & V>(v, id, hashMessageViewSender)
+}
+
+export function isValidMessageViewSender<V>(v: V) {
+  return isValid<MessageViewSender>(v, id, hashMessageViewSender)
 }
 
 export interface ConvoView {
+  $type?: $Type<'chat.bsky.convo.defs', 'convoView'>
   id: string
   rev: string
   members: ChatBskyActorDefs.ProfileViewBasic[]
   lastMessage?:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MessageView>
+    | $Typed<DeletedMessageView>
+    | { $type: string }
   muted: boolean
   opened?: boolean
   unreadCount: number
-  [k: string]: unknown
 }
 
-export function isConvoView(
-  v: unknown,
-): v is ConvoView & { $type: $Type<'chat.bsky.convo.defs', 'convoView'> } {
-  return is$typed(v, id, 'convoView')
+const hashConvoView = 'convoView'
+
+export function isConvoView<V>(v: V) {
+  return is$typed(v, id, hashConvoView)
 }
 
-export function validateConvoView(v: unknown) {
-  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
+export function validateConvoView<V>(v: V) {
+  return validate<ConvoView & V>(v, id, hashConvoView)
+}
+
+export function isValidConvoView<V>(v: V) {
+  return isValid<ConvoView>(v, id, hashConvoView)
 }
 
 export interface LogBeginConvo {
+  $type?: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogBeginConvo(
-  v: unknown,
-): v is LogBeginConvo & {
-  $type: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
-} {
-  return is$typed(v, id, 'logBeginConvo')
+const hashLogBeginConvo = 'logBeginConvo'
+
+export function isLogBeginConvo<V>(v: V) {
+  return is$typed(v, id, hashLogBeginConvo)
 }
 
-export function validateLogBeginConvo(v: unknown) {
-  return lexicons.validate(
-    `${id}#logBeginConvo`,
-    v,
-  ) as ValidationResult<LogBeginConvo>
+export function validateLogBeginConvo<V>(v: V) {
+  return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
+}
+
+export function isValidLogBeginConvo<V>(v: V) {
+  return isValid<LogBeginConvo>(v, id, hashLogBeginConvo)
 }
 
 export interface LogLeaveConvo {
+  $type?: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogLeaveConvo(
-  v: unknown,
-): v is LogLeaveConvo & {
-  $type: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
-} {
-  return is$typed(v, id, 'logLeaveConvo')
+const hashLogLeaveConvo = 'logLeaveConvo'
+
+export function isLogLeaveConvo<V>(v: V) {
+  return is$typed(v, id, hashLogLeaveConvo)
 }
 
-export function validateLogLeaveConvo(v: unknown) {
-  return lexicons.validate(
-    `${id}#logLeaveConvo`,
-    v,
-  ) as ValidationResult<LogLeaveConvo>
+export function validateLogLeaveConvo<V>(v: V) {
+  return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
+}
+
+export function isValidLogLeaveConvo<V>(v: V) {
+  return isValid<LogLeaveConvo>(v, id, hashLogLeaveConvo)
 }
 
 export interface LogCreateMessage {
+  $type?: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogCreateMessage(
-  v: unknown,
-): v is LogCreateMessage & {
-  $type: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
-} {
-  return is$typed(v, id, 'logCreateMessage')
+const hashLogCreateMessage = 'logCreateMessage'
+
+export function isLogCreateMessage<V>(v: V) {
+  return is$typed(v, id, hashLogCreateMessage)
 }
 
-export function validateLogCreateMessage(v: unknown) {
-  return lexicons.validate(
-    `${id}#logCreateMessage`,
-    v,
-  ) as ValidationResult<LogCreateMessage>
+export function validateLogCreateMessage<V>(v: V) {
+  return validate<LogCreateMessage & V>(v, id, hashLogCreateMessage)
+}
+
+export function isValidLogCreateMessage<V>(v: V) {
+  return isValid<LogCreateMessage>(v, id, hashLogCreateMessage)
 }
 
 export interface LogDeleteMessage {
+  $type?: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
-}
-
-export function isLogDeleteMessage(
-  v: unknown,
-): v is LogDeleteMessage & {
-  $type: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
-} {
-  return is$typed(v, id, 'logDeleteMessage')
-}
-
-export function validateLogDeleteMessage(v: unknown) {
-  return lexicons.validate(
-    `${id}#logDeleteMessage`,
-    v,
-  ) as ValidationResult<LogDeleteMessage>
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
+}
+
+const hashLogDeleteMessage = 'logDeleteMessage'
+
+export function isLogDeleteMessage<V>(v: V) {
+  return is$typed(v, id, hashLogDeleteMessage)
+}
+
+export function validateLogDeleteMessage<V>(v: V) {
+  return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
+}
+
+export function isValidLogDeleteMessage<V>(v: V) {
+  return isValid<LogDeleteMessage>(v, id, hashLogDeleteMessage)
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index 4364c075ecd..e12b2d43889 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.deleteMessageForSelf'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.DeletedMessageView
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
index 7563c777197..71014d1779b 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getConvo'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index d7a1a69bb13..29f60bfb9ae 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getConvoForMembers'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
index 47f28623631..743e74fd7d2 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getLog'
 
 export interface QueryParams {
@@ -20,13 +26,12 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   logs: (
-    | ChatBskyConvoDefs.LogBeginConvo
-    | ChatBskyConvoDefs.LogLeaveConvo
-    | ChatBskyConvoDefs.LogCreateMessage
-    | ChatBskyConvoDefs.LogDeleteMessage
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
+    | $Typed<ChatBskyConvoDefs.LogCreateMessage>
+    | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
index 68f9331fdef..f32d67836cf 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getMessages'
 
 export interface QueryParams {
@@ -22,11 +28,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 67a3e3a141c..2e221f8574c 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.leaveConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convoId: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 5829bd5b899..07e35ea50ae 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.listConvos'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   convos: ChatBskyConvoDefs.ConvoView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index c12e1df0238..a510f259225 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.muteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index 6ac463db74c..b0e65cacaaa 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.sendMessage'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.MessageView
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index 1e34fdc658f..d432ca6776a 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.sendMessageBatch'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   items: BatchItem[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   items: ChatBskyConvoDefs.MessageView[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -52,19 +56,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface BatchItem {
+  $type?: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
-export function isBatchItem(
-  v: unknown,
-): v is BatchItem & {
-  $type: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
-} {
-  return is$typed(v, id, 'batchItem')
+const hashBatchItem = 'batchItem'
+
+export function isBatchItem<V>(v: V) {
+  return is$typed(v, id, hashBatchItem)
+}
+
+export function validateBatchItem<V>(v: V) {
+  return validate<BatchItem & V>(v, id, hashBatchItem)
 }
 
-export function validateBatchItem(v: unknown) {
-  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
+export function isValidBatchItem<V>(v: V) {
+  return isValid<BatchItem>(v, id, hashBatchItem)
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index 03188d2bbd2..abf20d15e45 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.unmuteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
index 8b7440714c0..562def1ec75 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.updateRead'
 
 export interface QueryParams {}
@@ -16,12 +22,10 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   messageId?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index bee28aeadad..991b6abf085 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.getActorMetadata'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export interface OutputSchema {
   day: Metadata
   month: Metadata
   all: Metadata
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,21 +54,23 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Metadata {
+  $type?: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
   messagesSent: number
   messagesReceived: number
   convos: number
   convosStarted: number
-  [k: string]: unknown
 }
 
-export function isMetadata(
-  v: unknown,
-): v is Metadata & {
-  $type: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
-} {
-  return is$typed(v, id, 'metadata')
+const hashMetadata = 'metadata'
+
+export function isMetadata<V>(v: V) {
+  return is$typed(v, id, hashMetadata)
+}
+
+export function validateMetadata<V>(v: V) {
+  return validate<Metadata & V>(v, id, hashMetadata)
 }
 
-export function validateMetadata(v: unknown) {
-  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
+export function isValidMetadata<V>(v: V) {
+  return isValid<Metadata>(v, id, hashMetadata)
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index a24045586b0..6426d17b62c 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from '../convo/defs'
+import type * as ChatBskyConvoDefs from '../convo/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.getMessageContext'
 
 export interface QueryParams {
@@ -23,11 +29,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index 2493a8063be..4caae41a9dd 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.updateActorAccess'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   actor: string
   allowAccess: boolean
   ref?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
index bdda35afb96..83f247d978c 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
@@ -3,36 +3,44 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoServerDefs from '../server/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from '../server/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.defs'
 
 export interface StatusAttr {
+  $type?: $Type<'com.atproto.admin.defs', 'statusAttr'>
   applied: boolean
   ref?: string
-  [k: string]: unknown
 }
 
-export function isStatusAttr(
-  v: unknown,
-): v is StatusAttr & { $type: $Type<'com.atproto.admin.defs', 'statusAttr'> } {
-  return is$typed(v, id, 'statusAttr')
+const hashStatusAttr = 'statusAttr'
+
+export function isStatusAttr<V>(v: V) {
+  return is$typed(v, id, hashStatusAttr)
+}
+
+export function validateStatusAttr<V>(v: V) {
+  return validate<StatusAttr & V>(v, id, hashStatusAttr)
 }
 
-export function validateStatusAttr(v: unknown) {
-  return lexicons.validate(
-    `${id}#statusAttr`,
-    v,
-  ) as ValidationResult<StatusAttr>
+export function isValidStatusAttr<V>(v: V) {
+  return isValid<StatusAttr>(v, id, hashStatusAttr)
 }
 
 export interface AccountView {
+  $type?: $Type<'com.atproto.admin.defs', 'accountView'>
   did: string
   handle: string
   email?: string
-  relatedRecords?: {}[]
+  relatedRecords?: { [_ in string]: unknown }[]
   indexedAt: string
   invitedBy?: ComAtprotoServerDefs.InviteCode
   invites?: ComAtprotoServerDefs.InviteCode[]
@@ -41,78 +49,78 @@ export interface AccountView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isAccountView(
-  v: unknown,
-): v is AccountView & {
-  $type: $Type<'com.atproto.admin.defs', 'accountView'>
-} {
-  return is$typed(v, id, 'accountView')
+const hashAccountView = 'accountView'
+
+export function isAccountView<V>(v: V) {
+  return is$typed(v, id, hashAccountView)
+}
+
+export function validateAccountView<V>(v: V) {
+  return validate<AccountView & V>(v, id, hashAccountView)
 }
 
-export function validateAccountView(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountView`,
-    v,
-  ) as ValidationResult<AccountView>
+export function isValidAccountView<V>(v: V) {
+  return isValid<AccountView>(v, id, hashAccountView)
 }
 
 export interface RepoRef {
+  $type?: $Type<'com.atproto.admin.defs', 'repoRef'>
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoRef(
-  v: unknown,
-): v is RepoRef & { $type: $Type<'com.atproto.admin.defs', 'repoRef'> } {
-  return is$typed(v, id, 'repoRef')
+const hashRepoRef = 'repoRef'
+
+export function isRepoRef<V>(v: V) {
+  return is$typed(v, id, hashRepoRef)
+}
+
+export function validateRepoRef<V>(v: V) {
+  return validate<RepoRef & V>(v, id, hashRepoRef)
 }
 
-export function validateRepoRef(v: unknown) {
-  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
+export function isValidRepoRef<V>(v: V) {
+  return isValid<RepoRef>(v, id, hashRepoRef)
 }
 
 export interface RepoBlobRef {
+  $type?: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
   did: string
   cid: string
   recordUri?: string
-  [k: string]: unknown
 }
 
-export function isRepoBlobRef(
-  v: unknown,
-): v is RepoBlobRef & {
-  $type: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
-} {
-  return is$typed(v, id, 'repoBlobRef')
+const hashRepoBlobRef = 'repoBlobRef'
+
+export function isRepoBlobRef<V>(v: V) {
+  return is$typed(v, id, hashRepoBlobRef)
+}
+
+export function validateRepoBlobRef<V>(v: V) {
+  return validate<RepoBlobRef & V>(v, id, hashRepoBlobRef)
 }
 
-export function validateRepoBlobRef(v: unknown) {
-  return lexicons.validate(
-    `${id}#repoBlobRef`,
-    v,
-  ) as ValidationResult<RepoBlobRef>
+export function isValidRepoBlobRef<V>(v: V) {
+  return isValid<RepoBlobRef>(v, id, hashRepoBlobRef)
 }
 
 export interface ThreatSignature {
+  $type?: $Type<'com.atproto.admin.defs', 'threatSignature'>
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isThreatSignature(
-  v: unknown,
-): v is ThreatSignature & {
-  $type: $Type<'com.atproto.admin.defs', 'threatSignature'>
-} {
-  return is$typed(v, id, 'threatSignature')
+const hashThreatSignature = 'threatSignature'
+
+export function isThreatSignature<V>(v: V) {
+  return is$typed(v, id, hashThreatSignature)
+}
+
+export function validateThreatSignature<V>(v: V) {
+  return validate<ThreatSignature & V>(v, id, hashThreatSignature)
 }
 
-export function validateThreatSignature(v: unknown) {
-  return lexicons.validate(
-    `${id}#threatSignature`,
-    v,
-  ) as ValidationResult<ThreatSignature>
+export function isValidThreatSignature<V>(v: V) {
+  return isValid<ThreatSignature>(v, id, hashThreatSignature)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 1acca2e1dab..68ebad488ae 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.deleteAccount'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index d36f19ceb36..b31a5692d40 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.disableAccountInvites'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for disabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 9a9db8e9659..75f5d78cc2f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.disableInviteCodes'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   codes?: string[]
   accounts?: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index a9e226a8e5d..e851600390b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.enableAccountInvites'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for enabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index 0cf60326ea3..3add811cb52 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getAccountInfo'
 
 export interface QueryParams {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index fb5c83de25a..4db2f194690 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getAccountInfos'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   infos: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index 80d9487ee8b..5e483dc9583 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from '../server/defs'
+import type * as ComAtprotoServerDefs from '../server/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getInviteCodes'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index 21448f88d6b..e002259fa45 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -4,12 +4,18 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getSubjectStatus'
 
 export interface QueryParams {
@@ -22,13 +28,12 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 6a554d7c424..5cbfa12eca1 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.searchAccounts'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
index baad3c1ee1f..cbe8f4a4d51 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.sendEmail'
 
 export interface QueryParams {}
@@ -19,12 +25,10 @@ export interface InputSchema {
   senderDid: string
   /** Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers */
   comment?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   sent: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index e3aed0b58c9..d127b4b584d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountEmail'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   /** The handle or DID of the repo. */
   account: string
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index 67c54a3b9de..dcd7b1b134e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountHandle'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   did: string
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index c05879469c4..c8af71f908b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountPassword'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   did: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index e6630229fc0..60986aec0c0 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -4,35 +4,39 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateSubjectStatus'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 56ae83a87d4..535dda90897 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.getRecommendedDidCredentials'
 
 export interface QueryParams {}
@@ -18,9 +24,8 @@ export interface OutputSchema {
   /** Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. */
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index b687f9d01bc..ffcd1bf517a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.requestPlcOperationSignature'
 
 export interface QueryParams {}
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index c9e880b7cee..bf795a9ee96 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.resolveHandle'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index c648e5b7ddf..83a046b24a8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.signPlcOperation'
 
 export interface QueryParams {}
@@ -17,15 +23,13 @@ export interface InputSchema {
   token?: string
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface OutputSchema {
   /** A signed DID PLC operation. */
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 3af1814148c..81b238852f3 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.submitPlcOperation'
 
 export interface QueryParams {}
 
 export interface InputSchema {
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
index c54d951e25d..a03f412c8a2 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.updateHandle'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** The new handle. */
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
index 8b0bc71b198..07a0a5293cd 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
+  $type?: $Type<'com.atproto.label.defs', 'label'>
   /** The AT Protocol version of the label object. */
   ver?: number
   /** DID of the actor who created this label. */
@@ -28,57 +35,66 @@ export interface Label {
   exp?: string
   /** Signature of dag-cbor encoded label. */
   sig?: Uint8Array
-  [k: string]: unknown
 }
 
-export function isLabel(
-  v: unknown,
-): v is Label & { $type: $Type<'com.atproto.label.defs', 'label'> } {
-  return is$typed(v, id, 'label')
+const hashLabel = 'label'
+
+export function isLabel<V>(v: V) {
+  return is$typed(v, id, hashLabel)
 }
 
-export function validateLabel(v: unknown) {
-  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
+export function validateLabel<V>(v: V) {
+  return validate<Label & V>(v, id, hashLabel)
+}
+
+export function isValidLabel<V>(v: V) {
+  return isValid<Label>(v, id, hashLabel)
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
 export interface SelfLabels {
+  $type?: $Type<'com.atproto.label.defs', 'selfLabels'>
   values: SelfLabel[]
-  [k: string]: unknown
 }
 
-export function isSelfLabels(
-  v: unknown,
-): v is SelfLabels & { $type: $Type<'com.atproto.label.defs', 'selfLabels'> } {
-  return is$typed(v, id, 'selfLabels')
+const hashSelfLabels = 'selfLabels'
+
+export function isSelfLabels<V>(v: V) {
+  return is$typed(v, id, hashSelfLabels)
+}
+
+export function validateSelfLabels<V>(v: V) {
+  return validate<SelfLabels & V>(v, id, hashSelfLabels)
 }
 
-export function validateSelfLabels(v: unknown) {
-  return lexicons.validate(
-    `${id}#selfLabels`,
-    v,
-  ) as ValidationResult<SelfLabels>
+export function isValidSelfLabels<V>(v: V) {
+  return isValid<SelfLabels>(v, id, hashSelfLabels)
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
 export interface SelfLabel {
+  $type?: $Type<'com.atproto.label.defs', 'selfLabel'>
   /** The short string name of the value or type of this label. */
   val: string
-  [k: string]: unknown
 }
 
-export function isSelfLabel(
-  v: unknown,
-): v is SelfLabel & { $type: $Type<'com.atproto.label.defs', 'selfLabel'> } {
-  return is$typed(v, id, 'selfLabel')
+const hashSelfLabel = 'selfLabel'
+
+export function isSelfLabel<V>(v: V) {
+  return is$typed(v, id, hashSelfLabel)
 }
 
-export function validateSelfLabel(v: unknown) {
-  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
+export function validateSelfLabel<V>(v: V) {
+  return validate<SelfLabel & V>(v, id, hashSelfLabel)
+}
+
+export function isValidSelfLabel<V>(v: V) {
+  return isValid<SelfLabel>(v, id, hashSelfLabel)
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
 export interface LabelValueDefinition {
+  $type?: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
   /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
   identifier: string
   /** How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. */
@@ -90,48 +106,53 @@ export interface LabelValueDefinition {
   /** Does the user need to have adult content enabled in order to configure this label? */
   adultOnly?: boolean
   locales: LabelValueDefinitionStrings[]
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinition(
-  v: unknown,
-): v is LabelValueDefinition & {
-  $type: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
-} {
-  return is$typed(v, id, 'labelValueDefinition')
+const hashLabelValueDefinition = 'labelValueDefinition'
+
+export function isLabelValueDefinition<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinition)
 }
 
-export function validateLabelValueDefinition(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelValueDefinition`,
-    v,
-  ) as ValidationResult<LabelValueDefinition>
+export function validateLabelValueDefinition<V>(v: V) {
+  return validate<LabelValueDefinition & V>(v, id, hashLabelValueDefinition)
+}
+
+export function isValidLabelValueDefinition<V>(v: V) {
+  return isValid<LabelValueDefinition>(v, id, hashLabelValueDefinition)
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
 export interface LabelValueDefinitionStrings {
+  $type?: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
   /** The code of the language these strings are written in. */
   lang: string
   /** A short human-readable name for the label. */
   name: string
   /** A longer description of what the label means and why it might be applied. */
   description: string
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinitionStrings(
-  v: unknown,
-): v is LabelValueDefinitionStrings & {
-  $type: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
-} {
-  return is$typed(v, id, 'labelValueDefinitionStrings')
+const hashLabelValueDefinitionStrings = 'labelValueDefinitionStrings'
+
+export function isLabelValueDefinitionStrings<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinitionStrings)
+}
+
+export function validateLabelValueDefinitionStrings<V>(v: V) {
+  return validate<LabelValueDefinitionStrings & V>(
+    v,
+    id,
+    hashLabelValueDefinitionStrings,
+  )
 }
 
-export function validateLabelValueDefinitionStrings(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelValueDefinitionStrings`,
+export function isValidLabelValueDefinitionStrings<V>(v: V) {
+  return isValid<LabelValueDefinitionStrings>(
     v,
-  ) as ValidationResult<LabelValueDefinitionStrings>
+    id,
+    hashLabelValueDefinitionStrings,
+  )
 }
 
 export type LabelValue =
diff --git a/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
index 62d114a2685..3303143287a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from './defs'
+import type * as ComAtprotoLabelDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.queryLabels'
 
 export interface QueryParams {
@@ -25,7 +31,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
index d09a2240b54..eab540ac06f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -3,12 +3,18 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
-import * as ComAtprotoLabelDefs from './defs'
+import type * as ComAtprotoLabelDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.subscribeLabels'
 
 export interface QueryParams {
@@ -16,10 +22,7 @@ export interface QueryParams {
   cursor?: number
 }
 
-export type OutputSchema =
-  | Labels
-  | Info
-  | { $type: string; [k: string]: unknown }
+export type OutputSchema = $Typed<Labels> | $Typed<Info> | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -33,35 +36,41 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => AsyncIterable<HandlerOutput>
 
 export interface Labels {
+  $type?: $Type<'com.atproto.label.subscribeLabels', 'labels'>
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabels(
-  v: unknown,
-): v is Labels & {
-  $type: $Type<'com.atproto.label.subscribeLabels', 'labels'>
-} {
-  return is$typed(v, id, 'labels')
+const hashLabels = 'labels'
+
+export function isLabels<V>(v: V) {
+  return is$typed(v, id, hashLabels)
+}
+
+export function validateLabels<V>(v: V) {
+  return validate<Labels & V>(v, id, hashLabels)
 }
 
-export function validateLabels(v: unknown) {
-  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
+export function isValidLabels<V>(v: V) {
+  return isValid<Labels>(v, id, hashLabels)
 }
 
 export interface Info {
+  $type?: $Type<'com.atproto.label.subscribeLabels', 'info'>
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(
-  v: unknown,
-): v is Info & { $type: $Type<'com.atproto.label.subscribeLabels', 'info'> } {
-  return is$typed(v, id, 'info')
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
+}
+
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown) {
-  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
+export function isValidInfo<V>(v: V) {
+  return isValid<Info>(v, id, hashInfo)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
index 5095d72d1fe..3cd0a38c3ce 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -4,13 +4,19 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../admin/defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoModerationDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../admin/defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.moderation.createReport'
 
 export interface QueryParams {}
@@ -20,10 +26,9 @@ export interface InputSchema {
   /** Additional context about the content and violation. */
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
 }
 
 export interface OutputSchema {
@@ -31,12 +36,11 @@ export interface OutputSchema {
   reasonType: ComAtprotoModerationDefs.ReasonType
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   reportedBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
index ed67a387dd5..4e2c8e68cbb 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -3,9 +3,15 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
index c1869f1de5a..458470300d7 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.applyWrites'
 
 export interface QueryParams {}
@@ -18,16 +24,18 @@ export interface InputSchema {
   repo: string
   /** Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
-  writes: (Create | Update | Delete)[]
+  writes: ($Typed<Create> | $Typed<Update> | $Typed<Delete>)[]
   /** If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  results?: (CreateResult | UpdateResult | DeleteResult)[]
-  [k: string]: unknown
+  results?: (
+    | $Typed<CreateResult>
+    | $Typed<UpdateResult>
+    | $Typed<DeleteResult>
+  )[]
 }
 
 export interface HandlerInput {
@@ -61,116 +69,125 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Operation which creates a new record. */
 export interface Create {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'create'>
   collection: string
   rkey?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isCreate(
-  v: unknown,
-): v is Create & { $type: $Type<'com.atproto.repo.applyWrites', 'create'> } {
-  return is$typed(v, id, 'create')
+const hashCreate = 'create'
+
+export function isCreate<V>(v: V) {
+  return is$typed(v, id, hashCreate)
+}
+
+export function validateCreate<V>(v: V) {
+  return validate<Create & V>(v, id, hashCreate)
 }
 
-export function validateCreate(v: unknown) {
-  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
+export function isValidCreate<V>(v: V) {
+  return isValid<Create>(v, id, hashCreate)
 }
 
 /** Operation which updates an existing record. */
 export interface Update {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'update'>
   collection: string
   rkey: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isUpdate(
-  v: unknown,
-): v is Update & { $type: $Type<'com.atproto.repo.applyWrites', 'update'> } {
-  return is$typed(v, id, 'update')
+const hashUpdate = 'update'
+
+export function isUpdate<V>(v: V) {
+  return is$typed(v, id, hashUpdate)
 }
 
-export function validateUpdate(v: unknown) {
-  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
+export function validateUpdate<V>(v: V) {
+  return validate<Update & V>(v, id, hashUpdate)
+}
+
+export function isValidUpdate<V>(v: V) {
+  return isValid<Update>(v, id, hashUpdate)
 }
 
 /** Operation which deletes an existing record. */
 export interface Delete {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'delete'>
   collection: string
   rkey: string
-  [k: string]: unknown
 }
 
-export function isDelete(
-  v: unknown,
-): v is Delete & { $type: $Type<'com.atproto.repo.applyWrites', 'delete'> } {
-  return is$typed(v, id, 'delete')
+const hashDelete = 'delete'
+
+export function isDelete<V>(v: V) {
+  return is$typed(v, id, hashDelete)
+}
+
+export function validateDelete<V>(v: V) {
+  return validate<Delete & V>(v, id, hashDelete)
 }
 
-export function validateDelete(v: unknown) {
-  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
+export function isValidDelete<V>(v: V) {
+  return isValid<Delete>(v, id, hashDelete)
 }
 
 export interface CreateResult {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'createResult'>
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isCreateResult(
-  v: unknown,
-): v is CreateResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'createResult'>
-} {
-  return is$typed(v, id, 'createResult')
+const hashCreateResult = 'createResult'
+
+export function isCreateResult<V>(v: V) {
+  return is$typed(v, id, hashCreateResult)
+}
+
+export function validateCreateResult<V>(v: V) {
+  return validate<CreateResult & V>(v, id, hashCreateResult)
 }
 
-export function validateCreateResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#createResult`,
-    v,
-  ) as ValidationResult<CreateResult>
+export function isValidCreateResult<V>(v: V) {
+  return isValid<CreateResult>(v, id, hashCreateResult)
 }
 
 export interface UpdateResult {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isUpdateResult(
-  v: unknown,
-): v is UpdateResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
-} {
-  return is$typed(v, id, 'updateResult')
+const hashUpdateResult = 'updateResult'
+
+export function isUpdateResult<V>(v: V) {
+  return is$typed(v, id, hashUpdateResult)
 }
 
-export function validateUpdateResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#updateResult`,
-    v,
-  ) as ValidationResult<UpdateResult>
+export function validateUpdateResult<V>(v: V) {
+  return validate<UpdateResult & V>(v, id, hashUpdateResult)
+}
+
+export function isValidUpdateResult<V>(v: V) {
+  return isValid<UpdateResult>(v, id, hashUpdateResult)
 }
 
 export interface DeleteResult {
-  [k: string]: unknown
+  $type?: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
+}
+
+const hashDeleteResult = 'deleteResult'
+
+export function isDeleteResult<V>(v: V) {
+  return is$typed(v, id, hashDeleteResult)
 }
 
-export function isDeleteResult(
-  v: unknown,
-): v is DeleteResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
-} {
-  return is$typed(v, id, 'deleteResult')
+export function validateDeleteResult<V>(v: V) {
+  return validate<DeleteResult & V>(v, id, hashDeleteResult)
 }
 
-export function validateDeleteResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#deleteResult`,
-    v,
-  ) as ValidationResult<DeleteResult>
+export function isValidDeleteResult<V>(v: V) {
+  return isValid<DeleteResult>(v, id, hashDeleteResult)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
index b155d82b176..e5bb47d0cec 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.createRecord'
 
 export interface QueryParams {}
@@ -23,10 +29,9 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record itself. Must contain a $type field. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -34,7 +39,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
index eeb0b484b7e..960bb17d66d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
@@ -3,26 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
+  $type?: $Type<'com.atproto.repo.defs', 'commitMeta'>
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
-export function isCommitMeta(
-  v: unknown,
-): v is CommitMeta & { $type: $Type<'com.atproto.repo.defs', 'commitMeta'> } {
-  return is$typed(v, id, 'commitMeta')
+const hashCommitMeta = 'commitMeta'
+
+export function isCommitMeta<V>(v: V) {
+  return is$typed(v, id, hashCommitMeta)
+}
+
+export function validateCommitMeta<V>(v: V) {
+  return validate<CommitMeta & V>(v, id, hashCommitMeta)
 }
 
-export function validateCommitMeta(v: unknown) {
-  return lexicons.validate(
-    `${id}#commitMeta`,
-    v,
-  ) as ValidationResult<CommitMeta>
+export function isValidCommitMeta<V>(v: V) {
+  return isValid<CommitMeta>(v, id, hashCommitMeta)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index f285caa3e28..19a2b19d773 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.deleteRecord'
 
 export interface QueryParams {}
@@ -24,12 +30,10 @@ export interface InputSchema {
   swapRecord?: string
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
index b3774866513..9fb82939ef9 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.describeRepo'
 
 export interface QueryParams {
@@ -21,12 +27,11 @@ export interface OutputSchema {
   handle: string
   did: string
   /** The complete DID document for this account. */
-  didDoc: {}
+  didDoc: { [_ in string]: unknown }
   /** List of all the collections (NSIDs) for which this repo contains at least one record. */
   collections: string[]
   /** Indicates if handle is currently valid (resolves bi-directionally) */
   handleIsCorrect: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
index ff0baecfadd..473b15cc725 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.getRecord'
 
 export interface QueryParams {
@@ -26,8 +32,7 @@ export type InputSchema = undefined
 export interface OutputSchema {
   uri: string
   cid?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
index 3dfc0334549..aa9d2cb1664 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.importRepo'
 
 export interface QueryParams {}
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index 38dc6a63164..86da1a967b8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.listMissingBlobs'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blobs: RecordBlob[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,22 +54,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RecordBlob {
+  $type?: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
   cid: string
   recordUri: string
-  [k: string]: unknown
 }
 
-export function isRecordBlob(
-  v: unknown,
-): v is RecordBlob & {
-  $type: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
-} {
-  return is$typed(v, id, 'recordBlob')
+const hashRecordBlob = 'recordBlob'
+
+export function isRecordBlob<V>(v: V) {
+  return is$typed(v, id, hashRecordBlob)
+}
+
+export function validateRecordBlob<V>(v: V) {
+  return validate<RecordBlob & V>(v, id, hashRecordBlob)
 }
 
-export function validateRecordBlob(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordBlob`,
-    v,
-  ) as ValidationResult<RecordBlob>
+export function isValidRecordBlob<V>(v: V) {
+  return isValid<RecordBlob>(v, id, hashRecordBlob)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
index 51b1393b9a8..479a1507e2f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.listRecords'
 
 export interface QueryParams {
@@ -31,7 +37,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   records: Record[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -60,18 +65,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Record {
+  $type?: $Type<'com.atproto.repo.listRecords', 'record'>
   uri: string
   cid: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'com.atproto.repo.listRecords', 'record'> } {
-  return is$typed(v, id, 'record')
+const hashRecord = 'record'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
index 427fcd8920d..d17ea9f9c14 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.putRecord'
 
 export interface QueryParams {}
@@ -23,12 +29,11 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record to write. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation */
   swapRecord?: string | null
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -36,7 +41,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
index a9298dcbe55..b4bb1c08e62 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -3,23 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
+  $type?: $Type<'com.atproto.repo.strongRef', 'main'>
   uri: string
   cid: string
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'com.atproto.repo.strongRef', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 7fc4618b664..01ffeea7b62 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.uploadBlob'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
index 886a33d1e19..b5f0669df24 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.activateAccount'
 
 export interface QueryParams {}
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index 730ec6aca5b..56dd73e28fa 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.checkAccountStatus'
 
 export interface QueryParams {}
@@ -24,7 +30,6 @@ export interface OutputSchema {
   privateStateValues: number
   expectedBlobs: number
   importedBlobs: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
index f681b0a1e2f..e128c603f53 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.confirmEmail'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   email: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
index bd033e64df2..82f4db53e8a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createAccount'
 
 export interface QueryParams {}
@@ -26,8 +32,7 @@ export interface InputSchema {
   /** DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. */
   recoveryKey?: string
   /** A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. */
-  plcOp?: {}
-  [k: string]: unknown
+  plcOp?: { [_ in string]: unknown }
 }
 
 /** Account login session returned on successful account creation. */
@@ -38,8 +43,7 @@ export interface OutputSchema {
   /** The DID of the new account. */
   did: string
   /** Complete DID document. */
-  didDoc?: {}
-  [k: string]: unknown
+  didDoc?: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 07028659ed2..9616711d2ad 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createAppPassword'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   name: string
   /** If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. */
   privileged?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = AppPassword
@@ -52,24 +57,23 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
   name: string
   password: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(
-  v: unknown,
-): v is AppPassword & {
-  $type: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
-} {
-  return is$typed(v, id, 'appPassword')
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
+}
+
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown) {
-  return lexicons.validate(
-    `${id}#appPassword`,
-    v,
-  ) as ValidationResult<AppPassword>
+export function isValidAppPassword<V>(v: V) {
+  return isValid<AppPassword>(v, id, hashAppPassword)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 27150f98e8a..cfba31bc08e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createInviteCode'
 
 export interface QueryParams {}
@@ -15,12 +21,10 @@ export interface QueryParams {}
 export interface InputSchema {
   useCount: number
   forAccount?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   code: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index 455201cdbc5..b6c739c5804 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createInviteCodes'
 
 export interface QueryParams {}
@@ -16,12 +22,10 @@ export interface InputSchema {
   codeCount: number
   useCount: number
   forAccounts?: string[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   codes: AccountCodes[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -53,22 +57,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AccountCodes {
+  $type?: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
   account: string
   codes: string[]
-  [k: string]: unknown
 }
 
-export function isAccountCodes(
-  v: unknown,
-): v is AccountCodes & {
-  $type: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
-} {
-  return is$typed(v, id, 'accountCodes')
+const hashAccountCodes = 'accountCodes'
+
+export function isAccountCodes<V>(v: V) {
+  return is$typed(v, id, hashAccountCodes)
+}
+
+export function validateAccountCodes<V>(v: V) {
+  return validate<AccountCodes & V>(v, id, hashAccountCodes)
 }
 
-export function validateAccountCodes(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountCodes`,
-    v,
-  ) as ValidationResult<AccountCodes>
+export function isValidAccountCodes<V>(v: V) {
+  return isValid<AccountCodes>(v, id, hashAccountCodes)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
index 8d846520ae9..7a178dd09ef 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createSession'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   identifier: string
   password: string
   authFactorToken?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -25,14 +30,13 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index 126255afd0d..e140ea3c638 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deactivateAccount'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** A recommendation to server as to how long they should hold onto the deactivated account before deleting. */
   deleteAfter?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
index ed33e0b2a0f..d8aa65cfcd2 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
+  $type?: $Type<'com.atproto.server.defs', 'inviteCode'>
   code: string
   available: number
   disabled: boolean
@@ -16,39 +23,38 @@ export interface InviteCode {
   createdBy: string
   createdAt: string
   uses: InviteCodeUse[]
-  [k: string]: unknown
 }
 
-export function isInviteCode(
-  v: unknown,
-): v is InviteCode & { $type: $Type<'com.atproto.server.defs', 'inviteCode'> } {
-  return is$typed(v, id, 'inviteCode')
+const hashInviteCode = 'inviteCode'
+
+export function isInviteCode<V>(v: V) {
+  return is$typed(v, id, hashInviteCode)
+}
+
+export function validateInviteCode<V>(v: V) {
+  return validate<InviteCode & V>(v, id, hashInviteCode)
 }
 
-export function validateInviteCode(v: unknown) {
-  return lexicons.validate(
-    `${id}#inviteCode`,
-    v,
-  ) as ValidationResult<InviteCode>
+export function isValidInviteCode<V>(v: V) {
+  return isValid<InviteCode>(v, id, hashInviteCode)
 }
 
 export interface InviteCodeUse {
+  $type?: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
   usedBy: string
   usedAt: string
-  [k: string]: unknown
 }
 
-export function isInviteCodeUse(
-  v: unknown,
-): v is InviteCodeUse & {
-  $type: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
-} {
-  return is$typed(v, id, 'inviteCodeUse')
+const hashInviteCodeUse = 'inviteCodeUse'
+
+export function isInviteCodeUse<V>(v: V) {
+  return is$typed(v, id, hashInviteCodeUse)
+}
+
+export function validateInviteCodeUse<V>(v: V) {
+  return validate<InviteCodeUse & V>(v, id, hashInviteCodeUse)
 }
 
-export function validateInviteCodeUse(v: unknown) {
-  return lexicons.validate(
-    `${id}#inviteCodeUse`,
-    v,
-  ) as ValidationResult<InviteCodeUse>
+export function isValidInviteCodeUse<V>(v: V) {
+  return isValid<InviteCodeUse>(v, id, hashInviteCodeUse)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
index e082e24ae10..55eceb8a979 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deleteAccount'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   did: string
   password: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
index 90c6882cf87..3ef21a16c51 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deleteSession'
 
 export interface QueryParams {}
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
index 736b7968877..e173e01549d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.describeServer'
 
 export interface QueryParams {}
@@ -24,7 +30,6 @@ export interface OutputSchema {
   links?: Links
   contact?: Contact
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -53,34 +58,40 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Links {
+  $type?: $Type<'com.atproto.server.describeServer', 'links'>
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(
-  v: unknown,
-): v is Links & { $type: $Type<'com.atproto.server.describeServer', 'links'> } {
-  return is$typed(v, id, 'links')
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
+}
+
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown) {
-  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
+export function isValidLinks<V>(v: V) {
+  return isValid<Links>(v, id, hashLinks)
 }
 
 export interface Contact {
+  $type?: $Type<'com.atproto.server.describeServer', 'contact'>
   email?: string
-  [k: string]: unknown
 }
 
-export function isContact(
-  v: unknown,
-): v is Contact & {
-  $type: $Type<'com.atproto.server.describeServer', 'contact'>
-} {
-  return is$typed(v, id, 'contact')
+const hashContact = 'contact'
+
+export function isContact<V>(v: V) {
+  return is$typed(v, id, hashContact)
+}
+
+export function validateContact<V>(v: V) {
+  return validate<Contact & V>(v, id, hashContact)
 }
 
-export function validateContact(v: unknown) {
-  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
+export function isValidContact<V>(v: V) {
+  return isValid<Contact>(v, id, hashContact)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 9668cf1f1e6..22962387ec0 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from './defs'
+import type * as ComAtprotoServerDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getAccountInviteCodes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 54b3a3d4423..eb2c4131d7a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getServiceAuth'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   token: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
index e98c753d9d0..bccc27b5931 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getSession'
 
 export interface QueryParams {}
@@ -20,11 +26,10 @@ export interface OutputSchema {
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index d868bbcb743..7a5c093fb08 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.listAppPasswords'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   passwords: AppPassword[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -46,23 +51,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
   name: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(
-  v: unknown,
-): v is AppPassword & {
-  $type: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
-} {
-  return is$typed(v, id, 'appPassword')
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
+}
+
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown) {
-  return lexicons.validate(
-    `${id}#appPassword`,
-    v,
-  ) as ValidationResult<AppPassword>
+export function isValidAppPassword<V>(v: V) {
+  return isValid<AppPassword>(v, id, hashAppPassword)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
index de1b570bf1a..ffbaaf3518f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.refreshSession'
 
 export interface QueryParams {}
@@ -19,11 +25,10 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** Hosting status of the account. If not specified, then assume 'active'. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 85131190ec9..016751b9480 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestAccountDelete'
 
 export interface QueryParams {}
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index fb58814aeb4..51e01eb4063 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestEmailConfirmation'
 
 export interface QueryParams {}
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 919e704328a..eb93689edfa 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestEmailUpdate'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   tokenRequired: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index f9bcec52a1f..d0229992fe0 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestPasswordReset'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 64dfb8c8414..fd1cd466f54 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.reserveSigningKey'
 
 export interface QueryParams {}
@@ -15,13 +21,11 @@ export interface QueryParams {}
 export interface InputSchema {
   /** The DID to reserve a key for. */
   did?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   /** The public key for the reserved signing key, in did:key serialization. */
   signingKey: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
index d842e7e266d..c137ee2c256 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.resetPassword'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   token: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 92a8204560e..134624bbdc9 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.revokeAppPassword'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   name: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
index 4381078a0a6..f2346c39f1f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.updateEmail'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   emailAuthFactor?: boolean
   /** Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. */
   token?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
index d42913abd01..96b1f8120fa 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getBlob'
 
 export interface QueryParams {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
index a7dc7e73000..8a3dc3fef63 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getBlocks'
 
 export interface QueryParams {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 53d5b4bf39b..a2aba307807 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getCheckout'
 
 export interface QueryParams {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
index 1adceb80d8a..35bc0192941 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getHead'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index 290c02e15fa..fe6eb20d335 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getLatestCommit'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
index 8f03eb23951..793596f713b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRecord'
 
 export interface QueryParams {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
index 9cde9a4e01b..e30bfbe96e6 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRepo'
 
 export interface QueryParams {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 414e67e7a67..6cebcb8cda8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRepoStatus'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export interface OutputSchema {
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
index 58fea9c1282..7ae1bb24487 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.listBlobs'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   cids: string[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
index 468977d448c..1980cda20c1 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.listRepos'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: Repo[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,6 +54,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Repo {
+  $type?: $Type<'com.atproto.sync.listRepos', 'repo'>
   did: string
   /** Current repo commit CID */
   head: string
@@ -56,15 +62,18 @@ export interface Repo {
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isRepo(
-  v: unknown,
-): v is Repo & { $type: $Type<'com.atproto.sync.listRepos', 'repo'> } {
-  return is$typed(v, id, 'repo')
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
+}
+
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
 }
 
-export function validateRepo(v: unknown) {
-  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
+export function isValidRepo<V>(v: V) {
+  return isValid<Repo>(v, id, hashRepo)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index 8fd62afe59e..fecb69994d2 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.notifyOfUpdate'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Hostname of the current service (usually a PDS) that is notifying of update. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index 5148b8c5f24..c2eeab14f4e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.requestCrawl'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Hostname of the current service (eg, PDS) that is requesting to be crawled. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 7c759389c2a..4d7a7444f92 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -3,11 +3,17 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.subscribeRepos'
 
 export interface QueryParams {
@@ -16,14 +22,14 @@ export interface QueryParams {
 }
 
 export type OutputSchema =
-  | Commit
-  | Identity
-  | Account
-  | Handle
-  | Migrate
-  | Tombstone
-  | Info
-  | { $type: string; [k: string]: unknown }
+  | $Typed<Commit>
+  | $Typed<Identity>
+  | $Typed<Account>
+  | $Typed<Handle>
+  | $Typed<Migrate>
+  | $Typed<Tombstone>
+  | $Typed<Info>
+  | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor' | 'ConsumerTooSlow'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -38,6 +44,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. */
 export interface Commit {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'commit'>
   /** The stream sequence number of this message. */
   seq: number
   /** DEPRECATED -- unused */
@@ -60,43 +67,49 @@ export interface Commit {
   blobs: CID[]
   /** Timestamp of when this message was originally broadcast. */
   time: string
-  [k: string]: unknown
 }
 
-export function isCommit(
-  v: unknown,
-): v is Commit & { $type: $Type<'com.atproto.sync.subscribeRepos', 'commit'> } {
-  return is$typed(v, id, 'commit')
+const hashCommit = 'commit'
+
+export function isCommit<V>(v: V) {
+  return is$typed(v, id, hashCommit)
+}
+
+export function validateCommit<V>(v: V) {
+  return validate<Commit & V>(v, id, hashCommit)
 }
 
-export function validateCommit(v: unknown) {
-  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
+export function isValidCommit<V>(v: V) {
+  return isValid<Commit>(v, id, hashCommit)
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
   seq: number
   did: string
   time: string
   /** The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details. */
   handle?: string
-  [k: string]: unknown
 }
 
-export function isIdentity(
-  v: unknown,
-): v is Identity & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
-} {
-  return is$typed(v, id, 'identity')
+const hashIdentity = 'identity'
+
+export function isIdentity<V>(v: V) {
+  return is$typed(v, id, hashIdentity)
+}
+
+export function validateIdentity<V>(v: V) {
+  return validate<Identity & V>(v, id, hashIdentity)
 }
 
-export function validateIdentity(v: unknown) {
-  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
+export function isValidIdentity<V>(v: V) {
+  return isValid<Identity>(v, id, hashIdentity)
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
 export interface Account {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'account'>
   seq: number
   did: string
   time: string
@@ -104,112 +117,129 @@ export interface Account {
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
   status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isAccount(
-  v: unknown,
-): v is Account & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'account'>
-} {
-  return is$typed(v, id, 'account')
+const hashAccount = 'account'
+
+export function isAccount<V>(v: V) {
+  return is$typed(v, id, hashAccount)
+}
+
+export function validateAccount<V>(v: V) {
+  return validate<Account & V>(v, id, hashAccount)
 }
 
-export function validateAccount(v: unknown) {
-  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
+export function isValidAccount<V>(v: V) {
+  return isValid<Account>(v, id, hashAccount)
 }
 
 /** DEPRECATED -- Use #identity event instead */
 export interface Handle {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'handle'>
   seq: number
   did: string
   handle: string
   time: string
-  [k: string]: unknown
 }
 
-export function isHandle(
-  v: unknown,
-): v is Handle & { $type: $Type<'com.atproto.sync.subscribeRepos', 'handle'> } {
-  return is$typed(v, id, 'handle')
+const hashHandle = 'handle'
+
+export function isHandle<V>(v: V) {
+  return is$typed(v, id, hashHandle)
+}
+
+export function validateHandle<V>(v: V) {
+  return validate<Handle & V>(v, id, hashHandle)
 }
 
-export function validateHandle(v: unknown) {
-  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
+export function isValidHandle<V>(v: V) {
+  return isValid<Handle>(v, id, hashHandle)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Migrate {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
   seq: number
   did: string
   migrateTo: string | null
   time: string
-  [k: string]: unknown
 }
 
-export function isMigrate(
-  v: unknown,
-): v is Migrate & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
-} {
-  return is$typed(v, id, 'migrate')
+const hashMigrate = 'migrate'
+
+export function isMigrate<V>(v: V) {
+  return is$typed(v, id, hashMigrate)
+}
+
+export function validateMigrate<V>(v: V) {
+  return validate<Migrate & V>(v, id, hashMigrate)
 }
 
-export function validateMigrate(v: unknown) {
-  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
+export function isValidMigrate<V>(v: V) {
+  return isValid<Migrate>(v, id, hashMigrate)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Tombstone {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
   seq: number
   did: string
   time: string
-  [k: string]: unknown
 }
 
-export function isTombstone(
-  v: unknown,
-): v is Tombstone & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
-} {
-  return is$typed(v, id, 'tombstone')
+const hashTombstone = 'tombstone'
+
+export function isTombstone<V>(v: V) {
+  return is$typed(v, id, hashTombstone)
+}
+
+export function validateTombstone<V>(v: V) {
+  return validate<Tombstone & V>(v, id, hashTombstone)
 }
 
-export function validateTombstone(v: unknown) {
-  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
+export function isValidTombstone<V>(v: V) {
+  return isValid<Tombstone>(v, id, hashTombstone)
 }
 
 export interface Info {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'info'>
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(
-  v: unknown,
-): v is Info & { $type: $Type<'com.atproto.sync.subscribeRepos', 'info'> } {
-  return is$typed(v, id, 'info')
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
+}
+
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown) {
-  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
+export function isValidInfo<V>(v: V) {
+  return isValid<Info>(v, id, hashInfo)
 }
 
 /** A repo operation, ie a mutation of a single record. */
 export interface RepoOp {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'>
   action: 'create' | 'update' | 'delete' | (string & {})
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  [k: string]: unknown
 }
 
-export function isRepoOp(
-  v: unknown,
-): v is RepoOp & { $type: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'> } {
-  return is$typed(v, id, 'repoOp')
+const hashRepoOp = 'repoOp'
+
+export function isRepoOp<V>(v: V) {
+  return is$typed(v, id, hashRepoOp)
+}
+
+export function validateRepoOp<V>(v: V) {
+  return validate<RepoOp & V>(v, id, hashRepoOp)
 }
 
-export function validateRepoOp(v: unknown) {
-  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
+export function isValidRepoOp<V>(v: V) {
+  return isValid<RepoOp>(v, id, hashRepoOp)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index 374ab85c589..c7057a308f1 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -4,22 +4,25 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.addReservedHandle'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   handle: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 948068c5a6d..84ea4beae25 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.checkSignupQueue'
 
 export interface QueryParams {}
@@ -18,7 +24,6 @@ export interface OutputSchema {
   activated: boolean
   placeInQueue?: number
   estimatedTimeMs?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index c8741a1331b..887b31780a8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from '../label/defs'
+import type * as ComAtprotoLabelDefs from '../label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.fetchLabels'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index 556fe779d21..cf9f08e088e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.requestPhoneVerification'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   phoneNumber: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
index b82931c64c7..4293c1388b3 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.createTemplate'
 
 export interface QueryParams {}
@@ -24,7 +30,6 @@ export interface InputSchema {
   lang?: string
   /** DID of the user who is creating the template. */
   createdBy?: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
index 3da6d45a98f..7cc4568c002 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
+  $type?: $Type<'tools.ozone.communication.defs', 'templateView'>
   id: string
   /** Name of the template. */
   name: string
@@ -23,20 +30,18 @@ export interface TemplateView {
   lastUpdatedBy: string
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isTemplateView(
-  v: unknown,
-): v is TemplateView & {
-  $type: $Type<'tools.ozone.communication.defs', 'templateView'>
-} {
-  return is$typed(v, id, 'templateView')
+const hashTemplateView = 'templateView'
+
+export function isTemplateView<V>(v: V) {
+  return is$typed(v, id, hashTemplateView)
+}
+
+export function validateTemplateView<V>(v: V) {
+  return validate<TemplateView & V>(v, id, hashTemplateView)
 }
 
-export function validateTemplateView(v: unknown) {
-  return lexicons.validate(
-    `${id}#templateView`,
-    v,
-  ) as ValidationResult<TemplateView>
+export function isValidTemplateView<V>(v: V) {
+  return isValid<TemplateView>(v, id, hashTemplateView)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
index bcdc2b523b1..26d62a9f265 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.deleteTemplate'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   id: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
index 74260b5c495..8225c6610b4 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.listTemplates'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   communicationTemplates: ToolsOzoneCommunicationDefs.TemplateView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
index e7bcacb14ff..b81e6cc0b11 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.updateTemplate'
 
 export interface QueryParams {}
@@ -27,7 +33,6 @@ export interface InputSchema {
   /** DID of the user who is updating the template. */
   updatedBy?: string
   disabled?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
index 05d86bc8529..b835c20d110 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -3,126 +3,128 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
-import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
-import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
+import type * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.defs'
 
 export interface ModEventView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventView'>
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ChatBskyConvoDefs.MessageRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ChatBskyConvoDefs.MessageRef>
+    | { $type: string }
   subjectBlobCids: string[]
   createdBy: string
   createdAt: string
   creatorHandle?: string
   subjectHandle?: string
-  [k: string]: unknown
 }
 
-export function isModEventView(
-  v: unknown,
-): v is ModEventView & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventView'>
-} {
-  return is$typed(v, id, 'modEventView')
+const hashModEventView = 'modEventView'
+
+export function isModEventView<V>(v: V) {
+  return is$typed(v, id, hashModEventView)
 }
 
-export function validateModEventView(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventView`,
-    v,
-  ) as ValidationResult<ModEventView>
+export function validateModEventView<V>(v: V) {
+  return validate<ModEventView & V>(v, id, hashModEventView)
+}
+
+export function isValidModEventView<V>(v: V) {
+  return isValid<ModEventView>(v, id, hashModEventView)
 }
 
 export interface ModEventViewDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventViewDetail'>
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | { $type: string }
   subject:
-    | RepoView
-    | RepoViewNotFound
-    | RecordView
-    | RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<RepoView>
+    | $Typed<RepoViewNotFound>
+    | $Typed<RecordView>
+    | $Typed<RecordViewNotFound>
+    | { $type: string }
   subjectBlobs: BlobView[]
   createdBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
-export function isModEventViewDetail(
-  v: unknown,
-): v is ModEventViewDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventViewDetail'>
-} {
-  return is$typed(v, id, 'modEventViewDetail')
+const hashModEventViewDetail = 'modEventViewDetail'
+
+export function isModEventViewDetail<V>(v: V) {
+  return is$typed(v, id, hashModEventViewDetail)
 }
 
-export function validateModEventViewDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventViewDetail`,
-    v,
-  ) as ValidationResult<ModEventViewDetail>
+export function validateModEventViewDetail<V>(v: V) {
+  return validate<ModEventViewDetail & V>(v, id, hashModEventViewDetail)
+}
+
+export function isValidModEventViewDetail<V>(v: V) {
+  return isValid<ModEventViewDetail>(v, id, hashModEventViewDetail)
 }
 
 export interface SubjectStatusView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'subjectStatusView'>
   id: number
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  hosting?:
-    | AccountHosting
-    | RecordHosting
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
+  hosting?: $Typed<AccountHosting> | $Typed<RecordHosting> | { $type: string }
   subjectBlobCids?: string[]
   subjectRepoHandle?: string
   /** Timestamp referencing when the last update was made to the moderation status of the subject */
@@ -144,22 +146,20 @@ export interface SubjectStatusView {
   appealed?: boolean
   suspendUntil?: string
   tags?: string[]
-  [k: string]: unknown
 }
 
-export function isSubjectStatusView(
-  v: unknown,
-): v is SubjectStatusView & {
-  $type: $Type<'tools.ozone.moderation.defs', 'subjectStatusView'>
-} {
-  return is$typed(v, id, 'subjectStatusView')
+const hashSubjectStatusView = 'subjectStatusView'
+
+export function isSubjectStatusView<V>(v: V) {
+  return is$typed(v, id, hashSubjectStatusView)
 }
 
-export function validateSubjectStatusView(v: unknown) {
-  return lexicons.validate(
-    `${id}#subjectStatusView`,
-    v,
-  ) as ValidationResult<SubjectStatusView>
+export function validateSubjectStatusView<V>(v: V) {
+  return validate<SubjectStatusView & V>(v, id, hashSubjectStatusView)
+}
+
+export function isValidSubjectStatusView<V>(v: V) {
+  return isValid<SubjectStatusView>(v, id, hashSubjectStatusView)
 }
 
 export type SubjectReviewState =
@@ -180,350 +180,340 @@ export const REVIEWNONE = `${id}#reviewNone`
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventTakedown'>
   comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
   acknowledgeAccountSubjects?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventTakedown(
-  v: unknown,
-): v is ModEventTakedown & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventTakedown'>
-} {
-  return is$typed(v, id, 'modEventTakedown')
+const hashModEventTakedown = 'modEventTakedown'
+
+export function isModEventTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventTakedown)
 }
 
-export function validateModEventTakedown(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventTakedown`,
-    v,
-  ) as ValidationResult<ModEventTakedown>
+export function validateModEventTakedown<V>(v: V) {
+  return validate<ModEventTakedown & V>(v, id, hashModEventTakedown)
+}
+
+export function isValidModEventTakedown<V>(v: V) {
+  return isValid<ModEventTakedown>(v, id, hashModEventTakedown)
 }
 
 /** Revert take down action on a subject */
 export interface ModEventReverseTakedown {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventReverseTakedown'>
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventReverseTakedown(
-  v: unknown,
-): v is ModEventReverseTakedown & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventReverseTakedown'>
-} {
-  return is$typed(v, id, 'modEventReverseTakedown')
+const hashModEventReverseTakedown = 'modEventReverseTakedown'
+
+export function isModEventReverseTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventReverseTakedown)
 }
 
-export function validateModEventReverseTakedown(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventReverseTakedown`,
+export function validateModEventReverseTakedown<V>(v: V) {
+  return validate<ModEventReverseTakedown & V>(
     v,
-  ) as ValidationResult<ModEventReverseTakedown>
+    id,
+    hashModEventReverseTakedown,
+  )
+}
+
+export function isValidModEventReverseTakedown<V>(v: V) {
+  return isValid<ModEventReverseTakedown>(v, id, hashModEventReverseTakedown)
 }
 
 /** Resolve appeal on a subject */
 export interface ModEventResolveAppeal {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventResolveAppeal'>
   /** Describe resolution. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventResolveAppeal(
-  v: unknown,
-): v is ModEventResolveAppeal & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventResolveAppeal'>
-} {
-  return is$typed(v, id, 'modEventResolveAppeal')
+const hashModEventResolveAppeal = 'modEventResolveAppeal'
+
+export function isModEventResolveAppeal<V>(v: V) {
+  return is$typed(v, id, hashModEventResolveAppeal)
 }
 
-export function validateModEventResolveAppeal(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventResolveAppeal`,
-    v,
-  ) as ValidationResult<ModEventResolveAppeal>
+export function validateModEventResolveAppeal<V>(v: V) {
+  return validate<ModEventResolveAppeal & V>(v, id, hashModEventResolveAppeal)
+}
+
+export function isValidModEventResolveAppeal<V>(v: V) {
+  return isValid<ModEventResolveAppeal>(v, id, hashModEventResolveAppeal)
 }
 
 /** Add a comment to a subject */
 export interface ModEventComment {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventComment'>
   comment: string
   /** Make the comment persistent on the subject */
   sticky?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventComment(
-  v: unknown,
-): v is ModEventComment & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventComment'>
-} {
-  return is$typed(v, id, 'modEventComment')
+const hashModEventComment = 'modEventComment'
+
+export function isModEventComment<V>(v: V) {
+  return is$typed(v, id, hashModEventComment)
 }
 
-export function validateModEventComment(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventComment`,
-    v,
-  ) as ValidationResult<ModEventComment>
+export function validateModEventComment<V>(v: V) {
+  return validate<ModEventComment & V>(v, id, hashModEventComment)
+}
+
+export function isValidModEventComment<V>(v: V) {
+  return isValid<ModEventComment>(v, id, hashModEventComment)
 }
 
 /** Report a subject */
 export interface ModEventReport {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventReport'>
   comment?: string
   /** Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject. */
   isReporterMuted?: boolean
   reportType: ComAtprotoModerationDefs.ReasonType
-  [k: string]: unknown
 }
 
-export function isModEventReport(
-  v: unknown,
-): v is ModEventReport & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventReport'>
-} {
-  return is$typed(v, id, 'modEventReport')
+const hashModEventReport = 'modEventReport'
+
+export function isModEventReport<V>(v: V) {
+  return is$typed(v, id, hashModEventReport)
 }
 
-export function validateModEventReport(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventReport`,
-    v,
-  ) as ValidationResult<ModEventReport>
+export function validateModEventReport<V>(v: V) {
+  return validate<ModEventReport & V>(v, id, hashModEventReport)
+}
+
+export function isValidModEventReport<V>(v: V) {
+  return isValid<ModEventReport>(v, id, hashModEventReport)
 }
 
 /** Apply/Negate labels on a subject */
 export interface ModEventLabel {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventLabel'>
   comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
-  [k: string]: unknown
 }
 
-export function isModEventLabel(
-  v: unknown,
-): v is ModEventLabel & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventLabel'>
-} {
-  return is$typed(v, id, 'modEventLabel')
+const hashModEventLabel = 'modEventLabel'
+
+export function isModEventLabel<V>(v: V) {
+  return is$typed(v, id, hashModEventLabel)
 }
 
-export function validateModEventLabel(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventLabel`,
-    v,
-  ) as ValidationResult<ModEventLabel>
+export function validateModEventLabel<V>(v: V) {
+  return validate<ModEventLabel & V>(v, id, hashModEventLabel)
+}
+
+export function isValidModEventLabel<V>(v: V) {
+  return isValid<ModEventLabel>(v, id, hashModEventLabel)
 }
 
 export interface ModEventAcknowledge {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventAcknowledge'>
   comment?: string
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
   acknowledgeAccountSubjects?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventAcknowledge(
-  v: unknown,
-): v is ModEventAcknowledge & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventAcknowledge'>
-} {
-  return is$typed(v, id, 'modEventAcknowledge')
+const hashModEventAcknowledge = 'modEventAcknowledge'
+
+export function isModEventAcknowledge<V>(v: V) {
+  return is$typed(v, id, hashModEventAcknowledge)
 }
 
-export function validateModEventAcknowledge(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventAcknowledge`,
-    v,
-  ) as ValidationResult<ModEventAcknowledge>
+export function validateModEventAcknowledge<V>(v: V) {
+  return validate<ModEventAcknowledge & V>(v, id, hashModEventAcknowledge)
+}
+
+export function isValidModEventAcknowledge<V>(v: V) {
+  return isValid<ModEventAcknowledge>(v, id, hashModEventAcknowledge)
 }
 
 export interface ModEventEscalate {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventEscalate'>
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEscalate(
-  v: unknown,
-): v is ModEventEscalate & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventEscalate'>
-} {
-  return is$typed(v, id, 'modEventEscalate')
+const hashModEventEscalate = 'modEventEscalate'
+
+export function isModEventEscalate<V>(v: V) {
+  return is$typed(v, id, hashModEventEscalate)
 }
 
-export function validateModEventEscalate(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventEscalate`,
-    v,
-  ) as ValidationResult<ModEventEscalate>
+export function validateModEventEscalate<V>(v: V) {
+  return validate<ModEventEscalate & V>(v, id, hashModEventEscalate)
+}
+
+export function isValidModEventEscalate<V>(v: V) {
+  return isValid<ModEventEscalate>(v, id, hashModEventEscalate)
 }
 
 /** Mute incoming reports on a subject */
 export interface ModEventMute {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventMute'>
   comment?: string
   /** Indicates how long the subject should remain muted. */
   durationInHours: number
-  [k: string]: unknown
 }
 
-export function isModEventMute(
-  v: unknown,
-): v is ModEventMute & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventMute'>
-} {
-  return is$typed(v, id, 'modEventMute')
+const hashModEventMute = 'modEventMute'
+
+export function isModEventMute<V>(v: V) {
+  return is$typed(v, id, hashModEventMute)
 }
 
-export function validateModEventMute(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventMute`,
-    v,
-  ) as ValidationResult<ModEventMute>
+export function validateModEventMute<V>(v: V) {
+  return validate<ModEventMute & V>(v, id, hashModEventMute)
+}
+
+export function isValidModEventMute<V>(v: V) {
+  return isValid<ModEventMute>(v, id, hashModEventMute)
 }
 
 /** Unmute action on a subject */
 export interface ModEventUnmute {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventUnmute'>
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmute(
-  v: unknown,
-): v is ModEventUnmute & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmute'>
-} {
-  return is$typed(v, id, 'modEventUnmute')
+const hashModEventUnmute = 'modEventUnmute'
+
+export function isModEventUnmute<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmute)
 }
 
-export function validateModEventUnmute(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventUnmute`,
-    v,
-  ) as ValidationResult<ModEventUnmute>
+export function validateModEventUnmute<V>(v: V) {
+  return validate<ModEventUnmute & V>(v, id, hashModEventUnmute)
+}
+
+export function isValidModEventUnmute<V>(v: V) {
+  return isValid<ModEventUnmute>(v, id, hashModEventUnmute)
 }
 
 /** Mute incoming reports from an account */
 export interface ModEventMuteReporter {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventMuteReporter'>
   comment?: string
   /** Indicates how long the account should remain muted. Falsy value here means a permanent mute. */
   durationInHours?: number
-  [k: string]: unknown
 }
 
-export function isModEventMuteReporter(
-  v: unknown,
-): v is ModEventMuteReporter & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventMuteReporter'>
-} {
-  return is$typed(v, id, 'modEventMuteReporter')
+const hashModEventMuteReporter = 'modEventMuteReporter'
+
+export function isModEventMuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventMuteReporter)
 }
 
-export function validateModEventMuteReporter(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventMuteReporter`,
-    v,
-  ) as ValidationResult<ModEventMuteReporter>
+export function validateModEventMuteReporter<V>(v: V) {
+  return validate<ModEventMuteReporter & V>(v, id, hashModEventMuteReporter)
+}
+
+export function isValidModEventMuteReporter<V>(v: V) {
+  return isValid<ModEventMuteReporter>(v, id, hashModEventMuteReporter)
 }
 
 /** Unmute incoming reports from an account */
 export interface ModEventUnmuteReporter {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventUnmuteReporter'>
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmuteReporter(
-  v: unknown,
-): v is ModEventUnmuteReporter & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmuteReporter'>
-} {
-  return is$typed(v, id, 'modEventUnmuteReporter')
+const hashModEventUnmuteReporter = 'modEventUnmuteReporter'
+
+export function isModEventUnmuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmuteReporter)
 }
 
-export function validateModEventUnmuteReporter(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventUnmuteReporter`,
-    v,
-  ) as ValidationResult<ModEventUnmuteReporter>
+export function validateModEventUnmuteReporter<V>(v: V) {
+  return validate<ModEventUnmuteReporter & V>(v, id, hashModEventUnmuteReporter)
+}
+
+export function isValidModEventUnmuteReporter<V>(v: V) {
+  return isValid<ModEventUnmuteReporter>(v, id, hashModEventUnmuteReporter)
 }
 
 /** Keep a log of outgoing email to a user */
 export interface ModEventEmail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventEmail'>
   /** The subject line of the email sent to the user. */
   subjectLine: string
   /** The content of the email sent to the user. */
   content?: string
   /** Additional comment about the outgoing comm. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEmail(
-  v: unknown,
-): v is ModEventEmail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventEmail'>
-} {
-  return is$typed(v, id, 'modEventEmail')
+const hashModEventEmail = 'modEventEmail'
+
+export function isModEventEmail<V>(v: V) {
+  return is$typed(v, id, hashModEventEmail)
 }
 
-export function validateModEventEmail(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventEmail`,
-    v,
-  ) as ValidationResult<ModEventEmail>
+export function validateModEventEmail<V>(v: V) {
+  return validate<ModEventEmail & V>(v, id, hashModEventEmail)
+}
+
+export function isValidModEventEmail<V>(v: V) {
+  return isValid<ModEventEmail>(v, id, hashModEventEmail)
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
 export interface ModEventDivert {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventDivert'>
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventDivert(
-  v: unknown,
-): v is ModEventDivert & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventDivert'>
-} {
-  return is$typed(v, id, 'modEventDivert')
+const hashModEventDivert = 'modEventDivert'
+
+export function isModEventDivert<V>(v: V) {
+  return is$typed(v, id, hashModEventDivert)
 }
 
-export function validateModEventDivert(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventDivert`,
-    v,
-  ) as ValidationResult<ModEventDivert>
+export function validateModEventDivert<V>(v: V) {
+  return validate<ModEventDivert & V>(v, id, hashModEventDivert)
+}
+
+export function isValidModEventDivert<V>(v: V) {
+  return isValid<ModEventDivert>(v, id, hashModEventDivert)
 }
 
 /** Add/Remove a tag on a subject */
 export interface ModEventTag {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventTag'>
   /** Tags to be added to the subject. If already exists, won't be duplicated. */
   add: string[]
   /** Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated. */
   remove: string[]
   /** Additional comment about added/removed tags. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventTag(
-  v: unknown,
-): v is ModEventTag & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventTag'>
-} {
-  return is$typed(v, id, 'modEventTag')
+const hashModEventTag = 'modEventTag'
+
+export function isModEventTag<V>(v: V) {
+  return is$typed(v, id, hashModEventTag)
 }
 
-export function validateModEventTag(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventTag`,
-    v,
-  ) as ValidationResult<ModEventTag>
+export function validateModEventTag<V>(v: V) {
+  return validate<ModEventTag & V>(v, id, hashModEventTag)
+}
+
+export function isValidModEventTag<V>(v: V) {
+  return isValid<ModEventTag>(v, id, hashModEventTag)
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface AccountEvent {
+  $type?: $Type<'tools.ozone.moderation.defs', 'accountEvent'>
   comment?: string
   /** Indicates that the account has a repository which can be fetched from the host that emitted this event. */
   active: boolean
@@ -536,78 +526,75 @@ export interface AccountEvent {
     | 'tombstoned'
     | (string & {})
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isAccountEvent(
-  v: unknown,
-): v is AccountEvent & {
-  $type: $Type<'tools.ozone.moderation.defs', 'accountEvent'>
-} {
-  return is$typed(v, id, 'accountEvent')
+const hashAccountEvent = 'accountEvent'
+
+export function isAccountEvent<V>(v: V) {
+  return is$typed(v, id, hashAccountEvent)
 }
 
-export function validateAccountEvent(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountEvent`,
-    v,
-  ) as ValidationResult<AccountEvent>
+export function validateAccountEvent<V>(v: V) {
+  return validate<AccountEvent & V>(v, id, hashAccountEvent)
+}
+
+export function isValidAccountEvent<V>(v: V) {
+  return isValid<AccountEvent>(v, id, hashAccountEvent)
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface IdentityEvent {
+  $type?: $Type<'tools.ozone.moderation.defs', 'identityEvent'>
   comment?: string
   handle?: string
   pdsHost?: string
   tombstone?: boolean
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isIdentityEvent(
-  v: unknown,
-): v is IdentityEvent & {
-  $type: $Type<'tools.ozone.moderation.defs', 'identityEvent'>
-} {
-  return is$typed(v, id, 'identityEvent')
+const hashIdentityEvent = 'identityEvent'
+
+export function isIdentityEvent<V>(v: V) {
+  return is$typed(v, id, hashIdentityEvent)
 }
 
-export function validateIdentityEvent(v: unknown) {
-  return lexicons.validate(
-    `${id}#identityEvent`,
-    v,
-  ) as ValidationResult<IdentityEvent>
+export function validateIdentityEvent<V>(v: V) {
+  return validate<IdentityEvent & V>(v, id, hashIdentityEvent)
+}
+
+export function isValidIdentityEvent<V>(v: V) {
+  return isValid<IdentityEvent>(v, id, hashIdentityEvent)
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface RecordEvent {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordEvent'>
   comment?: string
   op: 'create' | 'update' | 'delete' | (string & {})
   cid?: string
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isRecordEvent(
-  v: unknown,
-): v is RecordEvent & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordEvent'>
-} {
-  return is$typed(v, id, 'recordEvent')
+const hashRecordEvent = 'recordEvent'
+
+export function isRecordEvent<V>(v: V) {
+  return is$typed(v, id, hashRecordEvent)
 }
 
-export function validateRecordEvent(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordEvent`,
-    v,
-  ) as ValidationResult<RecordEvent>
+export function validateRecordEvent<V>(v: V) {
+  return validate<RecordEvent & V>(v, id, hashRecordEvent)
+}
+
+export function isValidRecordEvent<V>(v: V) {
+  return isValid<RecordEvent>(v, id, hashRecordEvent)
 }
 
 export interface RepoView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'repoView'>
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: Moderation
   invitedBy?: ComAtprotoServerDefs.InviteCode
@@ -615,24 +602,28 @@ export interface RepoView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoView(
-  v: unknown,
-): v is RepoView & { $type: $Type<'tools.ozone.moderation.defs', 'repoView'> } {
-  return is$typed(v, id, 'repoView')
+const hashRepoView = 'repoView'
+
+export function isRepoView<V>(v: V) {
+  return is$typed(v, id, hashRepoView)
+}
+
+export function validateRepoView<V>(v: V) {
+  return validate<RepoView & V>(v, id, hashRepoView)
 }
 
-export function validateRepoView(v: unknown) {
-  return lexicons.validate(`${id}#repoView`, v) as ValidationResult<RepoView>
+export function isValidRepoView<V>(v: V) {
+  return isValid<RepoView>(v, id, hashRepoView)
 }
 
 export interface RepoViewDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'repoViewDetail'>
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: ModerationDetail
   labels?: ComAtprotoLabelDefs.Label[]
@@ -643,224 +634,216 @@ export interface RepoViewDetail {
   emailConfirmedAt?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoViewDetail(
-  v: unknown,
-): v is RepoViewDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'repoViewDetail'>
-} {
-  return is$typed(v, id, 'repoViewDetail')
+const hashRepoViewDetail = 'repoViewDetail'
+
+export function isRepoViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRepoViewDetail)
 }
 
-export function validateRepoViewDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#repoViewDetail`,
-    v,
-  ) as ValidationResult<RepoViewDetail>
+export function validateRepoViewDetail<V>(v: V) {
+  return validate<RepoViewDetail & V>(v, id, hashRepoViewDetail)
+}
+
+export function isValidRepoViewDetail<V>(v: V) {
+  return isValid<RepoViewDetail>(v, id, hashRepoViewDetail)
 }
 
 export interface RepoViewNotFound {
+  $type?: $Type<'tools.ozone.moderation.defs', 'repoViewNotFound'>
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoViewNotFound(
-  v: unknown,
-): v is RepoViewNotFound & {
-  $type: $Type<'tools.ozone.moderation.defs', 'repoViewNotFound'>
-} {
-  return is$typed(v, id, 'repoViewNotFound')
+const hashRepoViewNotFound = 'repoViewNotFound'
+
+export function isRepoViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRepoViewNotFound)
 }
 
-export function validateRepoViewNotFound(v: unknown) {
-  return lexicons.validate(
-    `${id}#repoViewNotFound`,
-    v,
-  ) as ValidationResult<RepoViewNotFound>
+export function validateRepoViewNotFound<V>(v: V) {
+  return validate<RepoViewNotFound & V>(v, id, hashRepoViewNotFound)
+}
+
+export function isValidRepoViewNotFound<V>(v: V) {
+  return isValid<RepoViewNotFound>(v, id, hashRepoViewNotFound)
 }
 
 export interface RecordView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordView'>
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobCids: string[]
   indexedAt: string
   moderation: Moderation
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordView(
-  v: unknown,
-): v is RecordView & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordView'>
-} {
-  return is$typed(v, id, 'recordView')
+const hashRecordView = 'recordView'
+
+export function isRecordView<V>(v: V) {
+  return is$typed(v, id, hashRecordView)
 }
 
-export function validateRecordView(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordView`,
-    v,
-  ) as ValidationResult<RecordView>
+export function validateRecordView<V>(v: V) {
+  return validate<RecordView & V>(v, id, hashRecordView)
+}
+
+export function isValidRecordView<V>(v: V) {
+  return isValid<RecordView>(v, id, hashRecordView)
 }
 
 export interface RecordViewDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordViewDetail'>
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobs: BlobView[]
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
   moderation: ModerationDetail
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordViewDetail(
-  v: unknown,
-): v is RecordViewDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordViewDetail'>
-} {
-  return is$typed(v, id, 'recordViewDetail')
+const hashRecordViewDetail = 'recordViewDetail'
+
+export function isRecordViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRecordViewDetail)
 }
 
-export function validateRecordViewDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordViewDetail`,
-    v,
-  ) as ValidationResult<RecordViewDetail>
+export function validateRecordViewDetail<V>(v: V) {
+  return validate<RecordViewDetail & V>(v, id, hashRecordViewDetail)
+}
+
+export function isValidRecordViewDetail<V>(v: V) {
+  return isValid<RecordViewDetail>(v, id, hashRecordViewDetail)
 }
 
 export interface RecordViewNotFound {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordViewNotFound'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isRecordViewNotFound(
-  v: unknown,
-): v is RecordViewNotFound & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordViewNotFound'>
-} {
-  return is$typed(v, id, 'recordViewNotFound')
+const hashRecordViewNotFound = 'recordViewNotFound'
+
+export function isRecordViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRecordViewNotFound)
 }
 
-export function validateRecordViewNotFound(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordViewNotFound`,
-    v,
-  ) as ValidationResult<RecordViewNotFound>
+export function validateRecordViewNotFound<V>(v: V) {
+  return validate<RecordViewNotFound & V>(v, id, hashRecordViewNotFound)
+}
+
+export function isValidRecordViewNotFound<V>(v: V) {
+  return isValid<RecordViewNotFound>(v, id, hashRecordViewNotFound)
 }
 
 export interface Moderation {
+  $type?: $Type<'tools.ozone.moderation.defs', 'moderation'>
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModeration(
-  v: unknown,
-): v is Moderation & {
-  $type: $Type<'tools.ozone.moderation.defs', 'moderation'>
-} {
-  return is$typed(v, id, 'moderation')
+const hashModeration = 'moderation'
+
+export function isModeration<V>(v: V) {
+  return is$typed(v, id, hashModeration)
 }
 
-export function validateModeration(v: unknown) {
-  return lexicons.validate(
-    `${id}#moderation`,
-    v,
-  ) as ValidationResult<Moderation>
+export function validateModeration<V>(v: V) {
+  return validate<Moderation & V>(v, id, hashModeration)
+}
+
+export function isValidModeration<V>(v: V) {
+  return isValid<Moderation>(v, id, hashModeration)
 }
 
 export interface ModerationDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'moderationDetail'>
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModerationDetail(
-  v: unknown,
-): v is ModerationDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'moderationDetail'>
-} {
-  return is$typed(v, id, 'moderationDetail')
+const hashModerationDetail = 'moderationDetail'
+
+export function isModerationDetail<V>(v: V) {
+  return is$typed(v, id, hashModerationDetail)
 }
 
-export function validateModerationDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#moderationDetail`,
-    v,
-  ) as ValidationResult<ModerationDetail>
+export function validateModerationDetail<V>(v: V) {
+  return validate<ModerationDetail & V>(v, id, hashModerationDetail)
+}
+
+export function isValidModerationDetail<V>(v: V) {
+  return isValid<ModerationDetail>(v, id, hashModerationDetail)
 }
 
 export interface BlobView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'blobView'>
   cid: string
   mimeType: string
   size: number
   createdAt: string
-  details?:
-    | ImageDetails
-    | VideoDetails
-    | { $type: string; [k: string]: unknown }
+  details?: $Typed<ImageDetails> | $Typed<VideoDetails> | { $type: string }
   moderation?: Moderation
-  [k: string]: unknown
 }
 
-export function isBlobView(
-  v: unknown,
-): v is BlobView & { $type: $Type<'tools.ozone.moderation.defs', 'blobView'> } {
-  return is$typed(v, id, 'blobView')
+const hashBlobView = 'blobView'
+
+export function isBlobView<V>(v: V) {
+  return is$typed(v, id, hashBlobView)
+}
+
+export function validateBlobView<V>(v: V) {
+  return validate<BlobView & V>(v, id, hashBlobView)
 }
 
-export function validateBlobView(v: unknown) {
-  return lexicons.validate(`${id}#blobView`, v) as ValidationResult<BlobView>
+export function isValidBlobView<V>(v: V) {
+  return isValid<BlobView>(v, id, hashBlobView)
 }
 
 export interface ImageDetails {
+  $type?: $Type<'tools.ozone.moderation.defs', 'imageDetails'>
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isImageDetails(
-  v: unknown,
-): v is ImageDetails & {
-  $type: $Type<'tools.ozone.moderation.defs', 'imageDetails'>
-} {
-  return is$typed(v, id, 'imageDetails')
+const hashImageDetails = 'imageDetails'
+
+export function isImageDetails<V>(v: V) {
+  return is$typed(v, id, hashImageDetails)
 }
 
-export function validateImageDetails(v: unknown) {
-  return lexicons.validate(
-    `${id}#imageDetails`,
-    v,
-  ) as ValidationResult<ImageDetails>
+export function validateImageDetails<V>(v: V) {
+  return validate<ImageDetails & V>(v, id, hashImageDetails)
+}
+
+export function isValidImageDetails<V>(v: V) {
+  return isValid<ImageDetails>(v, id, hashImageDetails)
 }
 
 export interface VideoDetails {
+  $type?: $Type<'tools.ozone.moderation.defs', 'videoDetails'>
   width: number
   height: number
   length: number
-  [k: string]: unknown
 }
 
-export function isVideoDetails(
-  v: unknown,
-): v is VideoDetails & {
-  $type: $Type<'tools.ozone.moderation.defs', 'videoDetails'>
-} {
-  return is$typed(v, id, 'videoDetails')
+const hashVideoDetails = 'videoDetails'
+
+export function isVideoDetails<V>(v: V) {
+  return is$typed(v, id, hashVideoDetails)
 }
 
-export function validateVideoDetails(v: unknown) {
-  return lexicons.validate(
-    `${id}#videoDetails`,
-    v,
-  ) as ValidationResult<VideoDetails>
+export function validateVideoDetails<V>(v: V) {
+  return validate<VideoDetails & V>(v, id, hashVideoDetails)
+}
+
+export function isValidVideoDetails<V>(v: V) {
+  return isValid<VideoDetails>(v, id, hashVideoDetails)
 }
 
 export interface AccountHosting {
+  $type?: $Type<'tools.ozone.moderation.defs', 'accountHosting'>
   status:
     | 'takendown'
     | 'suspended'
@@ -873,43 +856,40 @@ export interface AccountHosting {
   deletedAt?: string
   deactivatedAt?: string
   reactivatedAt?: string
-  [k: string]: unknown
 }
 
-export function isAccountHosting(
-  v: unknown,
-): v is AccountHosting & {
-  $type: $Type<'tools.ozone.moderation.defs', 'accountHosting'>
-} {
-  return is$typed(v, id, 'accountHosting')
+const hashAccountHosting = 'accountHosting'
+
+export function isAccountHosting<V>(v: V) {
+  return is$typed(v, id, hashAccountHosting)
 }
 
-export function validateAccountHosting(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountHosting`,
-    v,
-  ) as ValidationResult<AccountHosting>
+export function validateAccountHosting<V>(v: V) {
+  return validate<AccountHosting & V>(v, id, hashAccountHosting)
+}
+
+export function isValidAccountHosting<V>(v: V) {
+  return isValid<AccountHosting>(v, id, hashAccountHosting)
 }
 
 export interface RecordHosting {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordHosting'>
   status: 'deleted' | 'unknown' | (string & {})
   updatedAt?: string
   createdAt?: string
   deletedAt?: string
-  [k: string]: unknown
 }
 
-export function isRecordHosting(
-  v: unknown,
-): v is RecordHosting & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordHosting'>
-} {
-  return is$typed(v, id, 'recordHosting')
+const hashRecordHosting = 'recordHosting'
+
+export function isRecordHosting<V>(v: V) {
+  return is$typed(v, id, hashRecordHosting)
 }
 
-export function validateRecordHosting(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordHosting`,
-    v,
-  ) as ValidationResult<RecordHosting>
+export function validateRecordHosting<V>(v: V) {
+  return validate<RecordHosting & V>(v, id, hashRecordHosting)
+}
+
+export function isValidRecordHosting<V>(v: V) {
+  return isValid<RecordHosting>(v, id, hashRecordHosting)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index 80a4fe08d09..e701314e22c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -4,44 +4,49 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as ToolsOzoneModerationDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.emitEvent'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   event:
-    | ToolsOzoneModerationDefs.ModEventTakedown
-    | ToolsOzoneModerationDefs.ModEventAcknowledge
-    | ToolsOzoneModerationDefs.ModEventEscalate
-    | ToolsOzoneModerationDefs.ModEventComment
-    | ToolsOzoneModerationDefs.ModEventLabel
-    | ToolsOzoneModerationDefs.ModEventReport
-    | ToolsOzoneModerationDefs.ModEventMute
-    | ToolsOzoneModerationDefs.ModEventUnmute
-    | ToolsOzoneModerationDefs.ModEventMuteReporter
-    | ToolsOzoneModerationDefs.ModEventUnmuteReporter
-    | ToolsOzoneModerationDefs.ModEventReverseTakedown
-    | ToolsOzoneModerationDefs.ModEventResolveAppeal
-    | ToolsOzoneModerationDefs.ModEventEmail
-    | ToolsOzoneModerationDefs.ModEventTag
-    | ToolsOzoneModerationDefs.AccountEvent
-    | ToolsOzoneModerationDefs.IdentityEvent
-    | ToolsOzoneModerationDefs.RecordEvent
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.ModEventTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventAcknowledge>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEscalate>
+    | $Typed<ToolsOzoneModerationDefs.ModEventComment>
+    | $Typed<ToolsOzoneModerationDefs.ModEventLabel>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReport>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEmail>
+    | $Typed<ToolsOzoneModerationDefs.ModEventTag>
+    | $Typed<ToolsOzoneModerationDefs.AccountEvent>
+    | $Typed<ToolsOzoneModerationDefs.IdentityEvent>
+    | $Typed<ToolsOzoneModerationDefs.RecordEvent>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   subjectBlobCids?: string[]
   createdBy: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneModerationDefs.ModEventView
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
index 1a84e25919e..77ed5b1f7fa 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getEvent'
 
 export interface QueryParams {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
index 6d8e603b879..0939ba10304 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRecord'
 
 export interface QueryParams {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
index 73a3199fa1f..89a39ea5a1b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRecords'
 
 export interface QueryParams {
@@ -19,11 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   records: (
-    | ToolsOzoneModerationDefs.RecordViewDetail
-    | ToolsOzoneModerationDefs.RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RecordViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RecordViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
index 84845fe0772..427ef422085 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRepo'
 
 export interface QueryParams {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
index 55245c421d4..3cf8c43c454 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRepos'
 
 export interface QueryParams {
@@ -19,11 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   repos: (
-    | ToolsOzoneModerationDefs.RepoViewDetail
-    | ToolsOzoneModerationDefs.RepoViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RepoViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RepoViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
index 328812e02f6..47a03ac1b68 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.queryEvents'
 
 export interface QueryParams {
@@ -50,7 +56,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   events: ToolsOzoneModerationDefs.ModEventView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index e730c7cf694..f5baa729535 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.queryStatuses'
 
 export interface QueryParams {
@@ -66,7 +72,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   subjectStatuses: ToolsOzoneModerationDefs.SubjectStatusView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
index 604790371c4..03fe5e1c989 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.searchRepos'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: ToolsOzoneModerationDefs.RepoView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts b/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
index e047acf71d4..33b66d50b31 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.server.getConfig'
 
 export interface QueryParams {}
@@ -20,7 +26,6 @@ export interface OutputSchema {
   blobDivert?: ServiceConfig
   chat?: ServiceConfig
   viewer?: ViewerConfig
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,45 +54,43 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface ServiceConfig {
+  $type?: $Type<'tools.ozone.server.getConfig', 'serviceConfig'>
   url?: string
-  [k: string]: unknown
 }
 
-export function isServiceConfig(
-  v: unknown,
-): v is ServiceConfig & {
-  $type: $Type<'tools.ozone.server.getConfig', 'serviceConfig'>
-} {
-  return is$typed(v, id, 'serviceConfig')
+const hashServiceConfig = 'serviceConfig'
+
+export function isServiceConfig<V>(v: V) {
+  return is$typed(v, id, hashServiceConfig)
+}
+
+export function validateServiceConfig<V>(v: V) {
+  return validate<ServiceConfig & V>(v, id, hashServiceConfig)
 }
 
-export function validateServiceConfig(v: unknown) {
-  return lexicons.validate(
-    `${id}#serviceConfig`,
-    v,
-  ) as ValidationResult<ServiceConfig>
+export function isValidServiceConfig<V>(v: V) {
+  return isValid<ServiceConfig>(v, id, hashServiceConfig)
 }
 
 export interface ViewerConfig {
+  $type?: $Type<'tools.ozone.server.getConfig', 'viewerConfig'>
   role?:
     | 'tools.ozone.team.defs#roleAdmin'
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isViewerConfig(
-  v: unknown,
-): v is ViewerConfig & {
-  $type: $Type<'tools.ozone.server.getConfig', 'viewerConfig'>
-} {
-  return is$typed(v, id, 'viewerConfig')
+const hashViewerConfig = 'viewerConfig'
+
+export function isViewerConfig<V>(v: V) {
+  return is$typed(v, id, hashViewerConfig)
+}
+
+export function validateViewerConfig<V>(v: V) {
+  return validate<ViewerConfig & V>(v, id, hashViewerConfig)
 }
 
-export function validateViewerConfig(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerConfig`,
-    v,
-  ) as ValidationResult<ViewerConfig>
+export function isValidViewerConfig<V>(v: V) {
+  return isValid<ViewerConfig>(v, id, hashViewerConfig)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
index 15290b1da5a..0ad224fd32d 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.addValues'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to add to the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
index 60be9fcb90d..7353057bbef 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
@@ -3,42 +3,56 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.defs'
 
 export interface Set {
+  $type?: $Type<'tools.ozone.set.defs', 'set'>
   name: string
   description?: string
-  [k: string]: unknown
 }
 
-export function isSet(
-  v: unknown,
-): v is Set & { $type: $Type<'tools.ozone.set.defs', 'set'> } {
-  return is$typed(v, id, 'set')
+const hashSet = 'set'
+
+export function isSet<V>(v: V) {
+  return is$typed(v, id, hashSet)
+}
+
+export function validateSet<V>(v: V) {
+  return validate<Set & V>(v, id, hashSet)
 }
 
-export function validateSet(v: unknown) {
-  return lexicons.validate(`${id}#set`, v) as ValidationResult<Set>
+export function isValidSet<V>(v: V) {
+  return isValid<Set>(v, id, hashSet)
 }
 
 export interface SetView {
+  $type?: $Type<'tools.ozone.set.defs', 'setView'>
   name: string
   description?: string
   setSize: number
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isSetView(
-  v: unknown,
-): v is SetView & { $type: $Type<'tools.ozone.set.defs', 'setView'> } {
-  return is$typed(v, id, 'setView')
+const hashSetView = 'setView'
+
+export function isSetView<V>(v: V) {
+  return is$typed(v, id, hashSetView)
+}
+
+export function validateSetView<V>(v: V) {
+  return validate<SetView & V>(v, id, hashSetView)
 }
 
-export function validateSetView(v: unknown) {
-  return lexicons.validate(`${id}#setView`, v) as ValidationResult<SetView>
+export function isValidSetView<V>(v: V) {
+  return isValid<SetView>(v, id, hashSetView)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
index 997a74925b8..18fbf502ce5 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.deleteSet'
 
 export interface QueryParams {}
@@ -15,12 +21,9 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Name of the set to delete */
   name: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
index 8f9a6bd91e5..4468c1982ae 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.deleteValues'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to delete from the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
index dca0e183a00..57c2b2f6a31 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.getValues'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   set: ToolsOzoneSetDefs.SetView
   values: string[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
index 34531052800..bdbda5a02f8 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.querySets'
 
 export interface QueryParams {
@@ -25,7 +31,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   sets: ToolsOzoneSetDefs.SetView[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
index 15af30df6b3..7705bd3a27c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.upsertSet'
 
 export interface QueryParams {}
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
index c903a0bf88d..380567ec66e 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
@@ -3,15 +3,22 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.defs'
 
 export interface Option {
+  $type?: $Type<'tools.ozone.setting.defs', 'option'>
   key: string
   did: string
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   createdAt?: string
   updatedAt?: string
@@ -23,15 +30,18 @@ export interface Option {
   scope: 'instance' | 'personal' | (string & {})
   createdBy: string
   lastUpdatedBy: string
-  [k: string]: unknown
 }
 
-export function isOption(
-  v: unknown,
-): v is Option & { $type: $Type<'tools.ozone.setting.defs', 'option'> } {
-  return is$typed(v, id, 'option')
+const hashOption = 'option'
+
+export function isOption<V>(v: V) {
+  return is$typed(v, id, hashOption)
+}
+
+export function validateOption<V>(v: V) {
+  return validate<Option & V>(v, id, hashOption)
 }
 
-export function validateOption(v: unknown) {
-  return lexicons.validate(`${id}#option`, v) as ValidationResult<Option>
+export function isValidOption<V>(v: V) {
+  return isValid<Option>(v, id, hashOption)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
index 4d18360c027..f76f66e75b3 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSettingDefs from './defs'
+import type * as ToolsOzoneSettingDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.listOptions'
 
 export interface QueryParams {
@@ -26,7 +32,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   options: ToolsOzoneSettingDefs.Option[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
index 108b8033ae9..f95cd96b6ff 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.removeOptions'
 
 export interface QueryParams {}
@@ -15,12 +21,9 @@ export interface QueryParams {}
 export interface InputSchema {
   keys: string[]
   scope: 'instance' | 'personal' | (string & {})
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
index f0492775e2a..34c67ac2fe3 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSettingDefs from './defs'
+import type * as ToolsOzoneSettingDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.upsertOption'
 
 export interface QueryParams {}
@@ -16,19 +22,17 @@ export interface QueryParams {}
 export interface InputSchema {
   key: string
   scope: 'instance' | 'personal' | (string & {})
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   managerRole?:
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | 'tools.ozone.team.defs#roleAdmin'
     | (string & {})
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   option: ToolsOzoneSettingDefs.Option
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
index 59680e98758..361ed968924 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
@@ -3,25 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
+  $type?: $Type<'tools.ozone.signature.defs', 'sigDetail'>
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isSigDetail(
-  v: unknown,
-): v is SigDetail & {
-  $type: $Type<'tools.ozone.signature.defs', 'sigDetail'>
-} {
-  return is$typed(v, id, 'sigDetail')
+const hashSigDetail = 'sigDetail'
+
+export function isSigDetail<V>(v: V) {
+  return is$typed(v, id, hashSigDetail)
+}
+
+export function validateSigDetail<V>(v: V) {
+  return validate<SigDetail & V>(v, id, hashSigDetail)
 }
 
-export function validateSigDetail(v: unknown) {
-  return lexicons.validate(`${id}#sigDetail`, v) as ValidationResult<SigDetail>
+export function isValidSigDetail<V>(v: V) {
+  return isValid<SigDetail>(v, id, hashSigDetail)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
index 93070d36f52..da5627f7a75 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSignatureDefs from './defs'
+import type * as ToolsOzoneSignatureDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.findCorrelation'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   details: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
index 37e59dc28ab..58dd130d3c6 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -4,12 +4,18 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ToolsOzoneSignatureDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ToolsOzoneSignatureDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.findRelatedAccounts'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: RelatedAccount[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -52,22 +57,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RelatedAccount {
+  $type?: $Type<'tools.ozone.signature.findRelatedAccounts', 'relatedAccount'>
   account: ComAtprotoAdminDefs.AccountView
   similarities?: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
-export function isRelatedAccount(
-  v: unknown,
-): v is RelatedAccount & {
-  $type: $Type<'tools.ozone.signature.findRelatedAccounts', 'relatedAccount'>
-} {
-  return is$typed(v, id, 'relatedAccount')
+const hashRelatedAccount = 'relatedAccount'
+
+export function isRelatedAccount<V>(v: V) {
+  return is$typed(v, id, hashRelatedAccount)
+}
+
+export function validateRelatedAccount<V>(v: V) {
+  return validate<RelatedAccount & V>(v, id, hashRelatedAccount)
 }
 
-export function validateRelatedAccount(v: unknown) {
-  return lexicons.validate(
-    `${id}#relatedAccount`,
-    v,
-  ) as ValidationResult<RelatedAccount>
+export function isValidRelatedAccount<V>(v: V) {
+  return isValid<RelatedAccount>(v, id, hashRelatedAccount)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
index 7b1484c8619..38e6bd95d20 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.searchAccounts'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
index 288313038be..6093ec7901b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.addMember'
 
 export interface QueryParams {}
@@ -20,7 +26,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
index d6e51429c77..3a56797e596 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.defs'
 
 export interface Member {
+  $type?: $Type<'tools.ozone.team.defs', 'member'>
   did: string
   disabled?: boolean
   profile?: AppBskyActorDefs.ProfileViewDetailed
@@ -21,17 +28,20 @@ export interface Member {
     | 'lex:tools.ozone.team.defs#roleModerator'
     | 'lex:tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isMember(
-  v: unknown,
-): v is Member & { $type: $Type<'tools.ozone.team.defs', 'member'> } {
-  return is$typed(v, id, 'member')
+const hashMember = 'member'
+
+export function isMember<V>(v: V) {
+  return is$typed(v, id, hashMember)
+}
+
+export function validateMember<V>(v: V) {
+  return validate<Member & V>(v, id, hashMember)
 }
 
-export function validateMember(v: unknown) {
-  return lexicons.validate(`${id}#member`, v) as ValidationResult<Member>
+export function isValidMember<V>(v: V) {
+  return isValid<Member>(v, id, hashMember)
 }
 
 /** Admin role. Highest level of access, can perform all actions. */
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
index b6f0c8c2997..5adad6d468c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.deleteMember'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
index 9dffdbad5ce..ea672a80186 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   members: ToolsOzoneTeamDefs.Member[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
index d770b8fafb3..0b0d704b4a6 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.updateMember'
 
 export interface QueryParams {}
@@ -21,7 +27,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/ozone/src/lexicon/util.ts b/packages/ozone/src/lexicon/util.ts
index a8b8cc9e0b7..2d83b0960f1 100644
--- a/packages/ozone/src/lexicon/util.ts
+++ b/packages/ozone/src/lexicon/util.ts
@@ -1,39 +1,62 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
+export type OmitKey<T, K extends keyof T> = {
+  [K2 in keyof T as K2 extends K ? never : K2]: T[K2]
+}
+
 export type $Typed<V> = V & { $type: string }
 
 export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
   ? Id | `${Id}#${Hash}`
   : `${Id}#${Hash}`
 
-function has$type<V>(v: V): v is $Typed<V & object> {
-  return (
-    v != null &&
-    typeof v === 'object' &&
-    '$type' in v &&
-    typeof v.$type === 'string'
-  )
+function isObject<V>(v: V): v is V & object {
+  return v != null && typeof v === 'object'
 }
 
 function check$type<Id extends string, Hash extends string>(
-  $type: string,
+  $type: unknown,
   id: Id,
   hash: Hash,
 ): $type is $Type<Id, Hash> {
   return $type === id
     ? hash === 'main'
     : // $type === `${id}#${hash}`
-      $type.length === id.length + 1 + hash.length &&
+      typeof $type === 'string' &&
+        $type.length === id.length + 1 + hash.length &&
         $type.charCodeAt(id.length) === 35 /* '#' */ &&
         $type.startsWith(id) &&
         $type.endsWith(hash)
 }
 
+export type Is$Typed<V, Id extends string, Hash extends string> = V extends {
+  $type: $Type<Id, Hash>
+}
+  ? V
+  : V extends { $type?: string }
+    ? V extends { $type?: $Type<Id, Hash> }
+      ? $Typed<V>
+      : never
+    : V & { $type: $Type<Id, Hash> }
+
 export function is$typed<V, Id extends string, Hash extends string>(
   v: V,
   id: Id,
   hash: Hash,
-): v is V & object & { $type: $Type<Id, Hash> } {
-  return has$type(v) && check$type(v.$type, id, hash)
+): v is Is$Typed<V, Id, Hash> {
+  return isObject(v) && '$type' in v && check$type(v.$type, id, hash)
+}
+
+export function maybe$typed<V, Id extends string, Hash extends string>(
+  v: V,
+  id: Id,
+  hash: Hash,
+): v is V & object & { $type?: $Type<Id, Hash> } {
+  return (
+    isObject(v) &&
+    ('$type' in v
+      ? v.$type === undefined || check$type(v.$type, id, hash)
+      : true)
+  )
 }
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 32bd89f98a4..adc2ae7f0a9 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -1,7 +1,13 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { LexiconDoc, Lexicons } from '@atproto/lexicon'
+import {
+  LexiconDoc,
+  Lexicons,
+  ValidationError,
+  ValidationResult,
+} from '@atproto/lexicon'
+import { $Typed, is$typed, maybe$typed } from './util'
 
 export const schemaDict = {
   ComAtprotoAdminDefs: {
@@ -13575,6 +13581,44 @@ export const schemaDict = {
 
 export const schemas = Object.values(schemaDict)
 export const lexicons: Lexicons = new Lexicons(schemas)
+
+export function validate<V>(v: unknown, id: string, hash: string) {
+  return (
+    maybe$typed(v, id, hash)
+      ? lexicons.validate(`${id}#${hash}`, v)
+      : {
+          success: false,
+          error: new ValidationError(
+            `Must be an object with "${id}#${hash}" $type property`,
+          ),
+        }
+  ) as ValidationResult<V>
+}
+
+export function isValid<V extends { $type?: string }>(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType: true,
+): v is $Typed<V>
+export function isValid<V extends { $type?: string }>(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType?: boolean,
+): v is V
+export function isValid(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType?: boolean,
+) {
+  return (
+    (requiredType ? is$typed : maybe$typed)(v, id, hash) &&
+    validate(v, id, hash).success
+  )
+}
+
 export const ids = {
   ComAtprotoAdminDefs: 'com.atproto.admin.defs',
   ComAtprotoAdminDeleteAccount: 'com.atproto.admin.deleteAccount',
@@ -13825,4 +13869,4 @@ export const ids = {
   ToolsOzoneTeamDeleteMember: 'tools.ozone.team.deleteMember',
   ToolsOzoneTeamListMembers: 'tools.ozone.team.listMembers',
   ToolsOzoneTeamUpdateMember: 'tools.ozone.team.updateMember',
-}
+} as const
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
index 92c6cd53d28..5e42bd080d5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
@@ -3,15 +3,22 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyGraphDefs from '../graph/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
   did: string
   handle: string
   displayName?: string
@@ -20,25 +27,24 @@ export interface ProfileViewBasic {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   createdAt?: string
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(
-  v: unknown,
-): v is ProfileViewBasic & {
-  $type: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
-} {
-  return is$typed(v, id, 'profileViewBasic')
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewBasic`,
-    v,
-  ) as ValidationResult<ProfileViewBasic>
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
+}
+
+export function isValidProfileViewBasic<V>(v: V) {
+  return isValid<ProfileViewBasic>(v, id, hashProfileViewBasic)
 }
 
 export interface ProfileView {
+  $type?: $Type<'app.bsky.actor.defs', 'profileView'>
   did: string
   handle: string
   displayName?: string
@@ -49,23 +55,24 @@ export interface ProfileView {
   createdAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isProfileView(
-  v: unknown,
-): v is ProfileView & { $type: $Type<'app.bsky.actor.defs', 'profileView'> } {
-  return is$typed(v, id, 'profileView')
+const hashProfileView = 'profileView'
+
+export function isProfileView<V>(v: V) {
+  return is$typed(v, id, hashProfileView)
+}
+
+export function validateProfileView<V>(v: V) {
+  return validate<ProfileView & V>(v, id, hashProfileView)
 }
 
-export function validateProfileView(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileView`,
-    v,
-  ) as ValidationResult<ProfileView>
+export function isValidProfileView<V>(v: V) {
+  return isValid<ProfileView>(v, id, hashProfileView)
 }
 
 export interface ProfileViewDetailed {
+  $type?: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
   did: string
   handle: string
   displayName?: string
@@ -82,70 +89,67 @@ export interface ProfileViewDetailed {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   pinnedPost?: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isProfileViewDetailed(
-  v: unknown,
-): v is ProfileViewDetailed & {
-  $type: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
-} {
-  return is$typed(v, id, 'profileViewDetailed')
+const hashProfileViewDetailed = 'profileViewDetailed'
+
+export function isProfileViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashProfileViewDetailed)
+}
+
+export function validateProfileViewDetailed<V>(v: V) {
+  return validate<ProfileViewDetailed & V>(v, id, hashProfileViewDetailed)
 }
 
-export function validateProfileViewDetailed(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewDetailed`,
-    v,
-  ) as ValidationResult<ProfileViewDetailed>
+export function isValidProfileViewDetailed<V>(v: V) {
+  return isValid<ProfileViewDetailed>(v, id, hashProfileViewDetailed)
 }
 
 export interface ProfileAssociated {
+  $type?: $Type<'app.bsky.actor.defs', 'profileAssociated'>
   lists?: number
   feedgens?: number
   starterPacks?: number
   labeler?: boolean
   chat?: ProfileAssociatedChat
-  [k: string]: unknown
 }
 
-export function isProfileAssociated(
-  v: unknown,
-): v is ProfileAssociated & {
-  $type: $Type<'app.bsky.actor.defs', 'profileAssociated'>
-} {
-  return is$typed(v, id, 'profileAssociated')
+const hashProfileAssociated = 'profileAssociated'
+
+export function isProfileAssociated<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociated)
+}
+
+export function validateProfileAssociated<V>(v: V) {
+  return validate<ProfileAssociated & V>(v, id, hashProfileAssociated)
 }
 
-export function validateProfileAssociated(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileAssociated`,
-    v,
-  ) as ValidationResult<ProfileAssociated>
+export function isValidProfileAssociated<V>(v: V) {
+  return isValid<ProfileAssociated>(v, id, hashProfileAssociated)
 }
 
 export interface ProfileAssociatedChat {
+  $type?: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
-  [k: string]: unknown
 }
 
-export function isProfileAssociatedChat(
-  v: unknown,
-): v is ProfileAssociatedChat & {
-  $type: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
-} {
-  return is$typed(v, id, 'profileAssociatedChat')
+const hashProfileAssociatedChat = 'profileAssociatedChat'
+
+export function isProfileAssociatedChat<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociatedChat)
 }
 
-export function validateProfileAssociatedChat(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileAssociatedChat`,
-    v,
-  ) as ValidationResult<ProfileAssociatedChat>
+export function validateProfileAssociatedChat<V>(v: V) {
+  return validate<ProfileAssociatedChat & V>(v, id, hashProfileAssociatedChat)
+}
+
+export function isValidProfileAssociatedChat<V>(v: V) {
+  return isValid<ProfileAssociatedChat>(v, id, hashProfileAssociatedChat)
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: $Type<'app.bsky.actor.defs', 'viewerState'>
   muted?: boolean
   mutedByList?: AppBskyGraphDefs.ListViewBasic
   blockedBy?: boolean
@@ -154,185 +158,184 @@ export interface ViewerState {
   following?: string
   followedBy?: string
   knownFollowers?: KnownFollowers
-  [k: string]: unknown
 }
 
-export function isViewerState(
-  v: unknown,
-): v is ViewerState & { $type: $Type<'app.bsky.actor.defs', 'viewerState'> } {
-  return is$typed(v, id, 'viewerState')
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
+}
+
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerState`,
-    v,
-  ) as ValidationResult<ViewerState>
+export function isValidViewerState<V>(v: V) {
+  return isValid<ViewerState>(v, id, hashViewerState)
 }
 
 /** The subject's followers whom you also follow */
 export interface KnownFollowers {
+  $type?: $Type<'app.bsky.actor.defs', 'knownFollowers'>
   count: number
   followers: ProfileViewBasic[]
-  [k: string]: unknown
 }
 
-export function isKnownFollowers(
-  v: unknown,
-): v is KnownFollowers & {
-  $type: $Type<'app.bsky.actor.defs', 'knownFollowers'>
-} {
-  return is$typed(v, id, 'knownFollowers')
+const hashKnownFollowers = 'knownFollowers'
+
+export function isKnownFollowers<V>(v: V) {
+  return is$typed(v, id, hashKnownFollowers)
+}
+
+export function validateKnownFollowers<V>(v: V) {
+  return validate<KnownFollowers & V>(v, id, hashKnownFollowers)
 }
 
-export function validateKnownFollowers(v: unknown) {
-  return lexicons.validate(
-    `${id}#knownFollowers`,
-    v,
-  ) as ValidationResult<KnownFollowers>
+export function isValidKnownFollowers<V>(v: V) {
+  return isValid<KnownFollowers>(v, id, hashKnownFollowers)
 }
 
 export type Preferences = (
-  | AdultContentPref
-  | ContentLabelPref
-  | SavedFeedsPref
-  | SavedFeedsPrefV2
-  | PersonalDetailsPref
-  | FeedViewPref
-  | ThreadViewPref
-  | InterestsPref
-  | MutedWordsPref
-  | HiddenPostsPref
-  | BskyAppStatePref
-  | LabelersPref
-  | { $type: string; [k: string]: unknown }
+  | $Typed<AdultContentPref>
+  | $Typed<ContentLabelPref>
+  | $Typed<SavedFeedsPref>
+  | $Typed<SavedFeedsPrefV2>
+  | $Typed<PersonalDetailsPref>
+  | $Typed<FeedViewPref>
+  | $Typed<ThreadViewPref>
+  | $Typed<InterestsPref>
+  | $Typed<MutedWordsPref>
+  | $Typed<HiddenPostsPref>
+  | $Typed<BskyAppStatePref>
+  | $Typed<LabelersPref>
+  | { $type: string }
 )[]
 
 export interface AdultContentPref {
+  $type?: $Type<'app.bsky.actor.defs', 'adultContentPref'>
   enabled: boolean
-  [k: string]: unknown
 }
 
-export function isAdultContentPref(
-  v: unknown,
-): v is AdultContentPref & {
-  $type: $Type<'app.bsky.actor.defs', 'adultContentPref'>
-} {
-  return is$typed(v, id, 'adultContentPref')
+const hashAdultContentPref = 'adultContentPref'
+
+export function isAdultContentPref<V>(v: V) {
+  return is$typed(v, id, hashAdultContentPref)
 }
 
-export function validateAdultContentPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#adultContentPref`,
-    v,
-  ) as ValidationResult<AdultContentPref>
+export function validateAdultContentPref<V>(v: V) {
+  return validate<AdultContentPref & V>(v, id, hashAdultContentPref)
+}
+
+export function isValidAdultContentPref<V>(v: V) {
+  return isValid<AdultContentPref>(v, id, hashAdultContentPref)
 }
 
 export interface ContentLabelPref {
+  $type?: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
   /** Which labeler does this preference apply to? If undefined, applies globally. */
   labelerDid?: string
   label: string
   visibility: 'ignore' | 'show' | 'warn' | 'hide' | (string & {})
-  [k: string]: unknown
 }
 
-export function isContentLabelPref(
-  v: unknown,
-): v is ContentLabelPref & {
-  $type: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
-} {
-  return is$typed(v, id, 'contentLabelPref')
+const hashContentLabelPref = 'contentLabelPref'
+
+export function isContentLabelPref<V>(v: V) {
+  return is$typed(v, id, hashContentLabelPref)
+}
+
+export function validateContentLabelPref<V>(v: V) {
+  return validate<ContentLabelPref & V>(v, id, hashContentLabelPref)
 }
 
-export function validateContentLabelPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#contentLabelPref`,
-    v,
-  ) as ValidationResult<ContentLabelPref>
+export function isValidContentLabelPref<V>(v: V) {
+  return isValid<ContentLabelPref>(v, id, hashContentLabelPref)
 }
 
 export interface SavedFeed {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeed'>
   id: string
   type: 'feed' | 'list' | 'timeline' | (string & {})
   value: string
   pinned: boolean
-  [k: string]: unknown
 }
 
-export function isSavedFeed(
-  v: unknown,
-): v is SavedFeed & { $type: $Type<'app.bsky.actor.defs', 'savedFeed'> } {
-  return is$typed(v, id, 'savedFeed')
+const hashSavedFeed = 'savedFeed'
+
+export function isSavedFeed<V>(v: V) {
+  return is$typed(v, id, hashSavedFeed)
+}
+
+export function validateSavedFeed<V>(v: V) {
+  return validate<SavedFeed & V>(v, id, hashSavedFeed)
 }
 
-export function validateSavedFeed(v: unknown) {
-  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
+export function isValidSavedFeed<V>(v: V) {
+  return isValid<SavedFeed>(v, id, hashSavedFeed)
 }
 
 export interface SavedFeedsPrefV2 {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
   items: SavedFeed[]
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(
-  v: unknown,
-): v is SavedFeedsPrefV2 & {
-  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
-} {
-  return is$typed(v, id, 'savedFeedsPrefV2')
+const hashSavedFeedsPrefV2 = 'savedFeedsPrefV2'
+
+export function isSavedFeedsPrefV2<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPrefV2)
 }
 
-export function validateSavedFeedsPrefV2(v: unknown) {
-  return lexicons.validate(
-    `${id}#savedFeedsPrefV2`,
-    v,
-  ) as ValidationResult<SavedFeedsPrefV2>
+export function validateSavedFeedsPrefV2<V>(v: V) {
+  return validate<SavedFeedsPrefV2 & V>(v, id, hashSavedFeedsPrefV2)
+}
+
+export function isValidSavedFeedsPrefV2<V>(v: V) {
+  return isValid<SavedFeedsPrefV2>(v, id, hashSavedFeedsPrefV2)
 }
 
 export interface SavedFeedsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
   pinned: string[]
   saved: string[]
   timelineIndex?: number
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPref(
-  v: unknown,
-): v is SavedFeedsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
-} {
-  return is$typed(v, id, 'savedFeedsPref')
+const hashSavedFeedsPref = 'savedFeedsPref'
+
+export function isSavedFeedsPref<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPref)
+}
+
+export function validateSavedFeedsPref<V>(v: V) {
+  return validate<SavedFeedsPref & V>(v, id, hashSavedFeedsPref)
 }
 
-export function validateSavedFeedsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#savedFeedsPref`,
-    v,
-  ) as ValidationResult<SavedFeedsPref>
+export function isValidSavedFeedsPref<V>(v: V) {
+  return isValid<SavedFeedsPref>(v, id, hashSavedFeedsPref)
 }
 
 export interface PersonalDetailsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
   /** The birth date of account owner. */
   birthDate?: string
-  [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(
-  v: unknown,
-): v is PersonalDetailsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
-} {
-  return is$typed(v, id, 'personalDetailsPref')
+const hashPersonalDetailsPref = 'personalDetailsPref'
+
+export function isPersonalDetailsPref<V>(v: V) {
+  return is$typed(v, id, hashPersonalDetailsPref)
+}
+
+export function validatePersonalDetailsPref<V>(v: V) {
+  return validate<PersonalDetailsPref & V>(v, id, hashPersonalDetailsPref)
 }
 
-export function validatePersonalDetailsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#personalDetailsPref`,
-    v,
-  ) as ValidationResult<PersonalDetailsPref>
+export function isValidPersonalDetailsPref<V>(v: V) {
+  return isValid<PersonalDetailsPref>(v, id, hashPersonalDetailsPref)
 }
 
 export interface FeedViewPref {
+  $type?: $Type<'app.bsky.actor.defs', 'feedViewPref'>
   /** The URI of the feed, or an identifier which describes the feed. */
   feed: string
   /** Hide replies in the feed. */
@@ -345,23 +348,24 @@ export interface FeedViewPref {
   hideReposts?: boolean
   /** Hide quote posts in the feed. */
   hideQuotePosts?: boolean
-  [k: string]: unknown
 }
 
-export function isFeedViewPref(
-  v: unknown,
-): v is FeedViewPref & { $type: $Type<'app.bsky.actor.defs', 'feedViewPref'> } {
-  return is$typed(v, id, 'feedViewPref')
+const hashFeedViewPref = 'feedViewPref'
+
+export function isFeedViewPref<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPref)
 }
 
-export function validateFeedViewPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#feedViewPref`,
-    v,
-  ) as ValidationResult<FeedViewPref>
+export function validateFeedViewPref<V>(v: V) {
+  return validate<FeedViewPref & V>(v, id, hashFeedViewPref)
+}
+
+export function isValidFeedViewPref<V>(v: V) {
+  return isValid<FeedViewPref>(v, id, hashFeedViewPref)
 }
 
 export interface ThreadViewPref {
+  $type?: $Type<'app.bsky.actor.defs', 'threadViewPref'>
   /** Sorting mode for threads. */
   sort?:
     | 'oldest'
@@ -372,49 +376,47 @@ export interface ThreadViewPref {
     | (string & {})
   /** Show followed users at the top of all replies. */
   prioritizeFollowedUsers?: boolean
-  [k: string]: unknown
 }
 
-export function isThreadViewPref(
-  v: unknown,
-): v is ThreadViewPref & {
-  $type: $Type<'app.bsky.actor.defs', 'threadViewPref'>
-} {
-  return is$typed(v, id, 'threadViewPref')
+const hashThreadViewPref = 'threadViewPref'
+
+export function isThreadViewPref<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPref)
+}
+
+export function validateThreadViewPref<V>(v: V) {
+  return validate<ThreadViewPref & V>(v, id, hashThreadViewPref)
 }
 
-export function validateThreadViewPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadViewPref`,
-    v,
-  ) as ValidationResult<ThreadViewPref>
+export function isValidThreadViewPref<V>(v: V) {
+  return isValid<ThreadViewPref>(v, id, hashThreadViewPref)
 }
 
 export interface InterestsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'interestsPref'>
   /** A list of tags which describe the account owner's interests gathered during onboarding. */
   tags: string[]
-  [k: string]: unknown
 }
 
-export function isInterestsPref(
-  v: unknown,
-): v is InterestsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'interestsPref'>
-} {
-  return is$typed(v, id, 'interestsPref')
+const hashInterestsPref = 'interestsPref'
+
+export function isInterestsPref<V>(v: V) {
+  return is$typed(v, id, hashInterestsPref)
+}
+
+export function validateInterestsPref<V>(v: V) {
+  return validate<InterestsPref & V>(v, id, hashInterestsPref)
 }
 
-export function validateInterestsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#interestsPref`,
-    v,
-  ) as ValidationResult<InterestsPref>
+export function isValidInterestsPref<V>(v: V) {
+  return isValid<InterestsPref>(v, id, hashInterestsPref)
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
 
 /** A word that the account owner has muted. */
 export interface MutedWord {
+  $type?: $Type<'app.bsky.actor.defs', 'mutedWord'>
   id?: string
   /** The muted word itself. */
   value: string
@@ -424,162 +426,165 @@ export interface MutedWord {
   actorTarget: 'all' | 'exclude-following' | (string & {})
   /** The date and time at which the muted word will expire and no longer be applied. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isMutedWord(
-  v: unknown,
-): v is MutedWord & { $type: $Type<'app.bsky.actor.defs', 'mutedWord'> } {
-  return is$typed(v, id, 'mutedWord')
+const hashMutedWord = 'mutedWord'
+
+export function isMutedWord<V>(v: V) {
+  return is$typed(v, id, hashMutedWord)
 }
 
-export function validateMutedWord(v: unknown) {
-  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
+export function validateMutedWord<V>(v: V) {
+  return validate<MutedWord & V>(v, id, hashMutedWord)
+}
+
+export function isValidMutedWord<V>(v: V) {
+  return isValid<MutedWord>(v, id, hashMutedWord)
 }
 
 export interface MutedWordsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
   /** A list of words the account owner has muted. */
   items: MutedWord[]
-  [k: string]: unknown
 }
 
-export function isMutedWordsPref(
-  v: unknown,
-): v is MutedWordsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
-} {
-  return is$typed(v, id, 'mutedWordsPref')
+const hashMutedWordsPref = 'mutedWordsPref'
+
+export function isMutedWordsPref<V>(v: V) {
+  return is$typed(v, id, hashMutedWordsPref)
+}
+
+export function validateMutedWordsPref<V>(v: V) {
+  return validate<MutedWordsPref & V>(v, id, hashMutedWordsPref)
 }
 
-export function validateMutedWordsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#mutedWordsPref`,
-    v,
-  ) as ValidationResult<MutedWordsPref>
+export function isValidMutedWordsPref<V>(v: V) {
+  return isValid<MutedWordsPref>(v, id, hashMutedWordsPref)
 }
 
 export interface HiddenPostsPref {
+  $type?: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
   /** A list of URIs of posts the account owner has hidden. */
   items: string[]
-  [k: string]: unknown
 }
 
-export function isHiddenPostsPref(
-  v: unknown,
-): v is HiddenPostsPref & {
-  $type: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
-} {
-  return is$typed(v, id, 'hiddenPostsPref')
+const hashHiddenPostsPref = 'hiddenPostsPref'
+
+export function isHiddenPostsPref<V>(v: V) {
+  return is$typed(v, id, hashHiddenPostsPref)
+}
+
+export function validateHiddenPostsPref<V>(v: V) {
+  return validate<HiddenPostsPref & V>(v, id, hashHiddenPostsPref)
 }
 
-export function validateHiddenPostsPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#hiddenPostsPref`,
-    v,
-  ) as ValidationResult<HiddenPostsPref>
+export function isValidHiddenPostsPref<V>(v: V) {
+  return isValid<HiddenPostsPref>(v, id, hashHiddenPostsPref)
 }
 
 export interface LabelersPref {
+  $type?: $Type<'app.bsky.actor.defs', 'labelersPref'>
   labelers: LabelerPrefItem[]
-  [k: string]: unknown
 }
 
-export function isLabelersPref(
-  v: unknown,
-): v is LabelersPref & { $type: $Type<'app.bsky.actor.defs', 'labelersPref'> } {
-  return is$typed(v, id, 'labelersPref')
+const hashLabelersPref = 'labelersPref'
+
+export function isLabelersPref<V>(v: V) {
+  return is$typed(v, id, hashLabelersPref)
 }
 
-export function validateLabelersPref(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelersPref`,
-    v,
-  ) as ValidationResult<LabelersPref>
+export function validateLabelersPref<V>(v: V) {
+  return validate<LabelersPref & V>(v, id, hashLabelersPref)
+}
+
+export function isValidLabelersPref<V>(v: V) {
+  return isValid<LabelersPref>(v, id, hashLabelersPref)
 }
 
 export interface LabelerPrefItem {
+  $type?: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
   did: string
-  [k: string]: unknown
 }
 
-export function isLabelerPrefItem(
-  v: unknown,
-): v is LabelerPrefItem & {
-  $type: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
-} {
-  return is$typed(v, id, 'labelerPrefItem')
+const hashLabelerPrefItem = 'labelerPrefItem'
+
+export function isLabelerPrefItem<V>(v: V) {
+  return is$typed(v, id, hashLabelerPrefItem)
+}
+
+export function validateLabelerPrefItem<V>(v: V) {
+  return validate<LabelerPrefItem & V>(v, id, hashLabelerPrefItem)
 }
 
-export function validateLabelerPrefItem(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerPrefItem`,
-    v,
-  ) as ValidationResult<LabelerPrefItem>
+export function isValidLabelerPrefItem<V>(v: V) {
+  return isValid<LabelerPrefItem>(v, id, hashLabelerPrefItem)
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
 export interface BskyAppStatePref {
+  $type?: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
   activeProgressGuide?: BskyAppProgressGuide
   /** An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. */
   queuedNudges?: string[]
   /** Storage for NUXs the user has encountered. */
   nuxs?: Nux[]
-  [k: string]: unknown
 }
 
-export function isBskyAppStatePref(
-  v: unknown,
-): v is BskyAppStatePref & {
-  $type: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
-} {
-  return is$typed(v, id, 'bskyAppStatePref')
+const hashBskyAppStatePref = 'bskyAppStatePref'
+
+export function isBskyAppStatePref<V>(v: V) {
+  return is$typed(v, id, hashBskyAppStatePref)
+}
+
+export function validateBskyAppStatePref<V>(v: V) {
+  return validate<BskyAppStatePref & V>(v, id, hashBskyAppStatePref)
 }
 
-export function validateBskyAppStatePref(v: unknown) {
-  return lexicons.validate(
-    `${id}#bskyAppStatePref`,
-    v,
-  ) as ValidationResult<BskyAppStatePref>
+export function isValidBskyAppStatePref<V>(v: V) {
+  return isValid<BskyAppStatePref>(v, id, hashBskyAppStatePref)
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
 export interface BskyAppProgressGuide {
+  $type?: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
   guide: string
-  [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(
-  v: unknown,
-): v is BskyAppProgressGuide & {
-  $type: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
-} {
-  return is$typed(v, id, 'bskyAppProgressGuide')
+const hashBskyAppProgressGuide = 'bskyAppProgressGuide'
+
+export function isBskyAppProgressGuide<V>(v: V) {
+  return is$typed(v, id, hashBskyAppProgressGuide)
 }
 
-export function validateBskyAppProgressGuide(v: unknown) {
-  return lexicons.validate(
-    `${id}#bskyAppProgressGuide`,
-    v,
-  ) as ValidationResult<BskyAppProgressGuide>
+export function validateBskyAppProgressGuide<V>(v: V) {
+  return validate<BskyAppProgressGuide & V>(v, id, hashBskyAppProgressGuide)
+}
+
+export function isValidBskyAppProgressGuide<V>(v: V) {
+  return isValid<BskyAppProgressGuide>(v, id, hashBskyAppProgressGuide)
 }
 
 /** A new user experiences (NUX) storage object */
 export interface Nux {
+  $type?: $Type<'app.bsky.actor.defs', 'nux'>
   id: string
   completed: boolean
   /** Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters. */
   data?: string
   /** The date and time at which the NUX will expire and should be considered completed. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isNux(
-  v: unknown,
-): v is Nux & { $type: $Type<'app.bsky.actor.defs', 'nux'> } {
-  return is$typed(v, id, 'nux')
+const hashNux = 'nux'
+
+export function isNux<V>(v: V) {
+  return is$typed(v, id, hashNux)
+}
+
+export function validateNux<V>(v: V) {
+  return validate<Nux & V>(v, id, hashNux)
 }
 
-export function validateNux(v: unknown) {
-  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
+export function isValidNux<V>(v: V) {
+  return isValid<Nux>(v, id, hashNux)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
index 680cdd0967d..5137eefd413 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getPreferences'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
index 2ce818e78d1..4bac12add6a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getProfile'
 
 export interface QueryParams {
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 354d8677cc1..26c6aebec00 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getProfiles'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   profiles: AppBskyActorDefs.ProfileViewDetailed[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index 1690000cb13..a06adb17957 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.getSuggestions'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts b/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
index 9c71f43c191..666b6c48976 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.profile'
 
 export interface Record {
+  $type?: $Type<'app.bsky.actor.profile', 'main'>
   displayName?: string
   /** Free-form profile description text. */
   description?: string
@@ -18,21 +25,23 @@ export interface Record {
   avatar?: BlobRef
   /** Larger horizontal image to display behind profile view. */
   banner?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   joinedViaStarterPack?: ComAtprotoRepoStrongRef.Main
   pinnedPost?: ComAtprotoRepoStrongRef.Main
   createdAt?: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.actor.profile', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
index ecedca7927f..ccb8c277542 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -4,18 +4,23 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
index 5b788366ee5..ea9f15b5440 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.searchActors'
 
 export interface QueryParams {
@@ -25,7 +31,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index 754e2e8db17..e3448e6a100 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.actor.searchActorsTypeahead'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts b/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
index 299c6f4e414..73c40d8bdcb 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
@@ -3,27 +3,34 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
+  $type?: $Type<'app.bsky.embed.defs', 'aspectRatio'>
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isAspectRatio(
-  v: unknown,
-): v is AspectRatio & { $type: $Type<'app.bsky.embed.defs', 'aspectRatio'> } {
-  return is$typed(v, id, 'aspectRatio')
+const hashAspectRatio = 'aspectRatio'
+
+export function isAspectRatio<V>(v: V) {
+  return is$typed(v, id, hashAspectRatio)
+}
+
+export function validateAspectRatio<V>(v: V) {
+  return validate<AspectRatio & V>(v, id, hashAspectRatio)
 }
 
-export function validateAspectRatio(v: unknown) {
-  return lexicons.validate(
-    `${id}#aspectRatio`,
-    v,
-  ) as ValidationResult<AspectRatio>
+export function isValidAspectRatio<V>(v: V) {
+  return isValid<AspectRatio>(v, id, hashAspectRatio)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/external.ts b/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
index c8e6fd15147..1e4a775c3fe 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
@@ -3,79 +3,96 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
+  $type?: $Type<'app.bsky.embed.external', 'main'>
   external: External
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.external', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface External {
+  $type?: $Type<'app.bsky.embed.external', 'external'>
   uri: string
   title: string
   description: string
   thumb?: BlobRef
-  [k: string]: unknown
 }
 
-export function isExternal(
-  v: unknown,
-): v is External & { $type: $Type<'app.bsky.embed.external', 'external'> } {
-  return is$typed(v, id, 'external')
+const hashExternal = 'external'
+
+export function isExternal<V>(v: V) {
+  return is$typed(v, id, hashExternal)
+}
+
+export function validateExternal<V>(v: V) {
+  return validate<External & V>(v, id, hashExternal)
 }
 
-export function validateExternal(v: unknown) {
-  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
+export function isValidExternal<V>(v: V) {
+  return isValid<External>(v, id, hashExternal)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.external', 'view'>
   external: ViewExternal
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.external', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewExternal {
+  $type?: $Type<'app.bsky.embed.external', 'viewExternal'>
   uri: string
   title: string
   description: string
   thumb?: string
-  [k: string]: unknown
 }
 
-export function isViewExternal(
-  v: unknown,
-): v is ViewExternal & {
-  $type: $Type<'app.bsky.embed.external', 'viewExternal'>
-} {
-  return is$typed(v, id, 'viewExternal')
+const hashViewExternal = 'viewExternal'
+
+export function isViewExternal<V>(v: V) {
+  return is$typed(v, id, hashViewExternal)
+}
+
+export function validateViewExternal<V>(v: V) {
+  return validate<ViewExternal & V>(v, id, hashViewExternal)
 }
 
-export function validateViewExternal(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewExternal`,
-    v,
-  ) as ValidationResult<ViewExternal>
+export function isValidViewExternal<V>(v: V) {
+  return isValid<ViewExternal>(v, id, hashViewExternal)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/images.ts b/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
index 0fd622ba6c2..d0c14d0f827 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
@@ -3,61 +3,80 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyEmbedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.images'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.images', 'main'>
   images: Image[]
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.images', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface Image {
+  $type?: $Type<'app.bsky.embed.images', 'image'>
   image: BlobRef
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isImage(
-  v: unknown,
-): v is Image & { $type: $Type<'app.bsky.embed.images', 'image'> } {
-  return is$typed(v, id, 'image')
+const hashImage = 'image'
+
+export function isImage<V>(v: V) {
+  return is$typed(v, id, hashImage)
+}
+
+export function validateImage<V>(v: V) {
+  return validate<Image & V>(v, id, hashImage)
 }
 
-export function validateImage(v: unknown) {
-  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
+export function isValidImage<V>(v: V) {
+  return isValid<Image>(v, id, hashImage)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.images', 'view'>
   images: ViewImage[]
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.images', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewImage {
+  $type?: $Type<'app.bsky.embed.images', 'viewImage'>
   /** Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. */
   thumb: string
   /** Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. */
@@ -65,15 +84,18 @@ export interface ViewImage {
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isViewImage(
-  v: unknown,
-): v is ViewImage & { $type: $Type<'app.bsky.embed.images', 'viewImage'> } {
-  return is$typed(v, id, 'viewImage')
+const hashViewImage = 'viewImage'
+
+export function isViewImage<V>(v: V) {
+  return is$typed(v, id, hashViewImage)
+}
+
+export function validateViewImage<V>(v: V) {
+  return validate<ViewImage & V>(v, id, hashViewImage)
 }
 
-export function validateViewImage(v: unknown) {
-  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
+export function isValidViewImage<V>(v: V) {
+  return isValid<ViewImage>(v, id, hashViewImage)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/record.ts b/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
index cdfe527f361..082545b5db4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
@@ -3,154 +3,168 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedDefs from '../feed/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as AppBskyLabelerDefs from '../labeler/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
-import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as AppBskyFeedDefs from '../feed/defs'
+import type * as AppBskyGraphDefs from '../graph/defs'
+import type * as AppBskyLabelerDefs from '../labeler/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyEmbedImages from './images'
+import type * as AppBskyEmbedVideo from './video'
+import type * as AppBskyEmbedExternal from './external'
+import type * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.record'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.record', 'main'>
   record: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.record', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
+}
+
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.record', 'view'>
   record:
-    | ViewRecord
-    | ViewNotFound
-    | ViewBlocked
-    | ViewDetached
-    | AppBskyFeedDefs.GeneratorView
-    | AppBskyGraphDefs.ListView
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ViewRecord>
+    | $Typed<ViewNotFound>
+    | $Typed<ViewBlocked>
+    | $Typed<ViewDetached>
+    | $Typed<AppBskyFeedDefs.GeneratorView>
+    | $Typed<AppBskyGraphDefs.ListView>
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyGraphDefs.StarterPackViewBasic>
+    | { $type: string }
+}
+
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.record', 'view'> } {
-  return is$typed(v, id, 'view')
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
 
 export interface ViewRecord {
+  $type?: $Type<'app.bsky.embed.record', 'viewRecord'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
   /** The record data itself. */
-  value: {}
+  value: { [_ in string]: unknown }
   labels?: ComAtprotoLabelDefs.Label[]
   replyCount?: number
   repostCount?: number
   likeCount?: number
   quoteCount?: number
   embeds?: (
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   )[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isViewRecord(
-  v: unknown,
-): v is ViewRecord & { $type: $Type<'app.bsky.embed.record', 'viewRecord'> } {
-  return is$typed(v, id, 'viewRecord')
+const hashViewRecord = 'viewRecord'
+
+export function isViewRecord<V>(v: V) {
+  return is$typed(v, id, hashViewRecord)
+}
+
+export function validateViewRecord<V>(v: V) {
+  return validate<ViewRecord & V>(v, id, hashViewRecord)
 }
 
-export function validateViewRecord(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewRecord`,
-    v,
-  ) as ValidationResult<ViewRecord>
+export function isValidViewRecord<V>(v: V) {
+  return isValid<ViewRecord>(v, id, hashViewRecord)
 }
 
 export interface ViewNotFound {
+  $type?: $Type<'app.bsky.embed.record', 'viewNotFound'>
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isViewNotFound(
-  v: unknown,
-): v is ViewNotFound & {
-  $type: $Type<'app.bsky.embed.record', 'viewNotFound'>
-} {
-  return is$typed(v, id, 'viewNotFound')
+const hashViewNotFound = 'viewNotFound'
+
+export function isViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashViewNotFound)
+}
+
+export function validateViewNotFound<V>(v: V) {
+  return validate<ViewNotFound & V>(v, id, hashViewNotFound)
 }
 
-export function validateViewNotFound(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewNotFound`,
-    v,
-  ) as ValidationResult<ViewNotFound>
+export function isValidViewNotFound<V>(v: V) {
+  return isValid<ViewNotFound>(v, id, hashViewNotFound)
 }
 
 export interface ViewBlocked {
+  $type?: $Type<'app.bsky.embed.record', 'viewBlocked'>
   uri: string
   blocked: true
   author: AppBskyFeedDefs.BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isViewBlocked(
-  v: unknown,
-): v is ViewBlocked & { $type: $Type<'app.bsky.embed.record', 'viewBlocked'> } {
-  return is$typed(v, id, 'viewBlocked')
+const hashViewBlocked = 'viewBlocked'
+
+export function isViewBlocked<V>(v: V) {
+  return is$typed(v, id, hashViewBlocked)
 }
 
-export function validateViewBlocked(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewBlocked`,
-    v,
-  ) as ValidationResult<ViewBlocked>
+export function validateViewBlocked<V>(v: V) {
+  return validate<ViewBlocked & V>(v, id, hashViewBlocked)
+}
+
+export function isValidViewBlocked<V>(v: V) {
+  return isValid<ViewBlocked>(v, id, hashViewBlocked)
 }
 
 export interface ViewDetached {
+  $type?: $Type<'app.bsky.embed.record', 'viewDetached'>
   uri: string
   detached: true
-  [k: string]: unknown
 }
 
-export function isViewDetached(
-  v: unknown,
-): v is ViewDetached & {
-  $type: $Type<'app.bsky.embed.record', 'viewDetached'>
-} {
-  return is$typed(v, id, 'viewDetached')
+const hashViewDetached = 'viewDetached'
+
+export function isViewDetached<V>(v: V) {
+  return is$typed(v, id, hashViewDetached)
+}
+
+export function validateViewDetached<V>(v: V) {
+  return validate<ViewDetached & V>(v, id, hashViewDetached)
 }
 
-export function validateViewDetached(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewDetached`,
-    v,
-  ) as ValidationResult<ViewDetached>
+export function isValidViewDetached<V>(v: V) {
+  return isValid<ViewDetached>(v, id, hashViewDetached)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts b/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
index 9af46777257..c22958741f3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -3,51 +3,65 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyEmbedRecord from './record'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedRecord from './record'
+import type * as AppBskyEmbedImages from './images'
+import type * as AppBskyEmbedVideo from './video'
+import type * as AppBskyEmbedExternal from './external'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.recordWithMedia'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.recordWithMedia', 'main'>
   record: AppBskyEmbedRecord.Main
   media:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | { $type: string }
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.recordWithMedia', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.recordWithMedia', 'view'>
   record: AppBskyEmbedRecord.View
   media:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | { $type: string }
+}
+
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.recordWithMedia', 'view'> } {
-  return is$typed(v, id, 'view')
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/video.ts b/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
index e504f8adce9..3b8880139a1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
@@ -3,62 +3,80 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyEmbedDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.embed.video'
 
 export interface Main {
+  $type?: $Type<'app.bsky.embed.video', 'main'>
   video: BlobRef
   captions?: Caption[]
   /** Alt text description of the video, for accessibility. */
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.embed.video', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 export interface Caption {
+  $type?: $Type<'app.bsky.embed.video', 'caption'>
   lang: string
   file: BlobRef
-  [k: string]: unknown
 }
 
-export function isCaption(
-  v: unknown,
-): v is Caption & { $type: $Type<'app.bsky.embed.video', 'caption'> } {
-  return is$typed(v, id, 'caption')
+const hashCaption = 'caption'
+
+export function isCaption<V>(v: V) {
+  return is$typed(v, id, hashCaption)
 }
 
-export function validateCaption(v: unknown) {
-  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
+export function validateCaption<V>(v: V) {
+  return validate<Caption & V>(v, id, hashCaption)
+}
+
+export function isValidCaption<V>(v: V) {
+  return isValid<Caption>(v, id, hashCaption)
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.video', 'view'>
   cid: string
   playlist: string
   thumbnail?: string
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isView(
-  v: unknown,
-): v is View & { $type: $Type<'app.bsky.embed.video', 'view'> } {
-  return is$typed(v, id, 'view')
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
+}
+
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
-export function validateView(v: unknown) {
-  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
+export function isValidView<V>(v: V) {
+  return isValid<View>(v, id, hashView)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
index 573aeb47244..1269ef50b0a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
@@ -3,32 +3,39 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyGraphDefs from '../graph/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyEmbedImages from '../embed/images'
+import type * as AppBskyEmbedVideo from '../embed/video'
+import type * as AppBskyEmbedExternal from '../embed/external'
+import type * as AppBskyEmbedRecord from '../embed/record'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyGraphDefs from '../graph/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.defs'
 
 export interface PostView {
+  $type?: $Type<'app.bsky.feed.defs', 'postView'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
-  record: {}
+  record: { [_ in string]: unknown }
   embed?:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | AppBskyEmbedRecord.View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   replyCount?: number
   repostCount?: number
   likeCount?: number
@@ -37,215 +44,230 @@ export interface PostView {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   threadgate?: ThreadgateView
-  [k: string]: unknown
 }
 
-export function isPostView(
-  v: unknown,
-): v is PostView & { $type: $Type<'app.bsky.feed.defs', 'postView'> } {
-  return is$typed(v, id, 'postView')
+const hashPostView = 'postView'
+
+export function isPostView<V>(v: V) {
+  return is$typed(v, id, hashPostView)
+}
+
+export function validatePostView<V>(v: V) {
+  return validate<PostView & V>(v, id, hashPostView)
 }
 
-export function validatePostView(v: unknown) {
-  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
+export function isValidPostView<V>(v: V) {
+  return isValid<PostView>(v, id, hashPostView)
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: $Type<'app.bsky.feed.defs', 'viewerState'>
   repost?: string
   like?: string
   threadMuted?: boolean
   replyDisabled?: boolean
   embeddingDisabled?: boolean
   pinned?: boolean
-  [k: string]: unknown
 }
 
-export function isViewerState(
-  v: unknown,
-): v is ViewerState & { $type: $Type<'app.bsky.feed.defs', 'viewerState'> } {
-  return is$typed(v, id, 'viewerState')
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
+}
+
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerState`,
-    v,
-  ) as ValidationResult<ViewerState>
+export function isValidViewerState<V>(v: V) {
+  return isValid<ViewerState>(v, id, hashViewerState)
 }
 
 export interface FeedViewPost {
+  $type?: $Type<'app.bsky.feed.defs', 'feedViewPost'>
   post: PostView
   reply?: ReplyRef
-  reason?: ReasonRepost | ReasonPin | { $type: string; [k: string]: unknown }
+  reason?: $Typed<ReasonRepost> | $Typed<ReasonPin> | { $type: string }
   /** Context provided by feed generator that may be passed back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isFeedViewPost(
-  v: unknown,
-): v is FeedViewPost & { $type: $Type<'app.bsky.feed.defs', 'feedViewPost'> } {
-  return is$typed(v, id, 'feedViewPost')
+const hashFeedViewPost = 'feedViewPost'
+
+export function isFeedViewPost<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPost)
+}
+
+export function validateFeedViewPost<V>(v: V) {
+  return validate<FeedViewPost & V>(v, id, hashFeedViewPost)
 }
 
-export function validateFeedViewPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#feedViewPost`,
-    v,
-  ) as ValidationResult<FeedViewPost>
+export function isValidFeedViewPost<V>(v: V) {
+  return isValid<FeedViewPost>(v, id, hashFeedViewPost)
 }
 
 export interface ReplyRef {
+  $type?: $Type<'app.bsky.feed.defs', 'replyRef'>
   root:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   parent:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
-  [k: string]: unknown
 }
 
-export function isReplyRef(
-  v: unknown,
-): v is ReplyRef & { $type: $Type<'app.bsky.feed.defs', 'replyRef'> } {
-  return is$typed(v, id, 'replyRef')
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
+}
+
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown) {
-  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
+export function isValidReplyRef<V>(v: V) {
+  return isValid<ReplyRef>(v, id, hashReplyRef)
 }
 
 export interface ReasonRepost {
+  $type?: $Type<'app.bsky.feed.defs', 'reasonRepost'>
   by: AppBskyActorDefs.ProfileViewBasic
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isReasonRepost(
-  v: unknown,
-): v is ReasonRepost & { $type: $Type<'app.bsky.feed.defs', 'reasonRepost'> } {
-  return is$typed(v, id, 'reasonRepost')
+const hashReasonRepost = 'reasonRepost'
+
+export function isReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashReasonRepost)
+}
+
+export function validateReasonRepost<V>(v: V) {
+  return validate<ReasonRepost & V>(v, id, hashReasonRepost)
 }
 
-export function validateReasonRepost(v: unknown) {
-  return lexicons.validate(
-    `${id}#reasonRepost`,
-    v,
-  ) as ValidationResult<ReasonRepost>
+export function isValidReasonRepost<V>(v: V) {
+  return isValid<ReasonRepost>(v, id, hashReasonRepost)
 }
 
 export interface ReasonPin {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.defs', 'reasonPin'>
 }
 
-export function isReasonPin(
-  v: unknown,
-): v is ReasonPin & { $type: $Type<'app.bsky.feed.defs', 'reasonPin'> } {
-  return is$typed(v, id, 'reasonPin')
+const hashReasonPin = 'reasonPin'
+
+export function isReasonPin<V>(v: V) {
+  return is$typed(v, id, hashReasonPin)
 }
 
-export function validateReasonPin(v: unknown) {
-  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
+export function validateReasonPin<V>(v: V) {
+  return validate<ReasonPin & V>(v, id, hashReasonPin)
+}
+
+export function isValidReasonPin<V>(v: V) {
+  return isValid<ReasonPin>(v, id, hashReasonPin)
 }
 
 export interface ThreadViewPost {
+  $type?: $Type<'app.bsky.feed.defs', 'threadViewPost'>
   post: PostView
   parent?:
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   replies?: (
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
-export function isThreadViewPost(
-  v: unknown,
-): v is ThreadViewPost & {
-  $type: $Type<'app.bsky.feed.defs', 'threadViewPost'>
-} {
-  return is$typed(v, id, 'threadViewPost')
+const hashThreadViewPost = 'threadViewPost'
+
+export function isThreadViewPost<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPost)
 }
 
-export function validateThreadViewPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadViewPost`,
-    v,
-  ) as ValidationResult<ThreadViewPost>
+export function validateThreadViewPost<V>(v: V) {
+  return validate<ThreadViewPost & V>(v, id, hashThreadViewPost)
+}
+
+export function isValidThreadViewPost<V>(v: V) {
+  return isValid<ThreadViewPost>(v, id, hashThreadViewPost)
 }
 
 export interface NotFoundPost {
+  $type?: $Type<'app.bsky.feed.defs', 'notFoundPost'>
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundPost(
-  v: unknown,
-): v is NotFoundPost & { $type: $Type<'app.bsky.feed.defs', 'notFoundPost'> } {
-  return is$typed(v, id, 'notFoundPost')
+const hashNotFoundPost = 'notFoundPost'
+
+export function isNotFoundPost<V>(v: V) {
+  return is$typed(v, id, hashNotFoundPost)
+}
+
+export function validateNotFoundPost<V>(v: V) {
+  return validate<NotFoundPost & V>(v, id, hashNotFoundPost)
 }
 
-export function validateNotFoundPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#notFoundPost`,
-    v,
-  ) as ValidationResult<NotFoundPost>
+export function isValidNotFoundPost<V>(v: V) {
+  return isValid<NotFoundPost>(v, id, hashNotFoundPost)
 }
 
 export interface BlockedPost {
+  $type?: $Type<'app.bsky.feed.defs', 'blockedPost'>
   uri: string
   blocked: true
   author: BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isBlockedPost(
-  v: unknown,
-): v is BlockedPost & { $type: $Type<'app.bsky.feed.defs', 'blockedPost'> } {
-  return is$typed(v, id, 'blockedPost')
+const hashBlockedPost = 'blockedPost'
+
+export function isBlockedPost<V>(v: V) {
+  return is$typed(v, id, hashBlockedPost)
+}
+
+export function validateBlockedPost<V>(v: V) {
+  return validate<BlockedPost & V>(v, id, hashBlockedPost)
 }
 
-export function validateBlockedPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#blockedPost`,
-    v,
-  ) as ValidationResult<BlockedPost>
+export function isValidBlockedPost<V>(v: V) {
+  return isValid<BlockedPost>(v, id, hashBlockedPost)
 }
 
 export interface BlockedAuthor {
+  $type?: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
   did: string
   viewer?: AppBskyActorDefs.ViewerState
-  [k: string]: unknown
 }
 
-export function isBlockedAuthor(
-  v: unknown,
-): v is BlockedAuthor & {
-  $type: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
-} {
-  return is$typed(v, id, 'blockedAuthor')
+const hashBlockedAuthor = 'blockedAuthor'
+
+export function isBlockedAuthor<V>(v: V) {
+  return is$typed(v, id, hashBlockedAuthor)
 }
 
-export function validateBlockedAuthor(v: unknown) {
-  return lexicons.validate(
-    `${id}#blockedAuthor`,
-    v,
-  ) as ValidationResult<BlockedAuthor>
+export function validateBlockedAuthor<V>(v: V) {
+  return validate<BlockedAuthor & V>(v, id, hashBlockedAuthor)
+}
+
+export function isValidBlockedAuthor<V>(v: V) {
+  return isValid<BlockedAuthor>(v, id, hashBlockedAuthor)
 }
 
 export interface GeneratorView {
+  $type?: $Type<'app.bsky.feed.defs', 'generatorView'>
   uri: string
   cid: string
   did: string
@@ -259,133 +281,127 @@ export interface GeneratorView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: GeneratorViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isGeneratorView(
-  v: unknown,
-): v is GeneratorView & {
-  $type: $Type<'app.bsky.feed.defs', 'generatorView'>
-} {
-  return is$typed(v, id, 'generatorView')
+const hashGeneratorView = 'generatorView'
+
+export function isGeneratorView<V>(v: V) {
+  return is$typed(v, id, hashGeneratorView)
 }
 
-export function validateGeneratorView(v: unknown) {
-  return lexicons.validate(
-    `${id}#generatorView`,
-    v,
-  ) as ValidationResult<GeneratorView>
+export function validateGeneratorView<V>(v: V) {
+  return validate<GeneratorView & V>(v, id, hashGeneratorView)
+}
+
+export function isValidGeneratorView<V>(v: V) {
+  return isValid<GeneratorView>(v, id, hashGeneratorView)
 }
 
 export interface GeneratorViewerState {
+  $type?: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
   like?: string
-  [k: string]: unknown
 }
 
-export function isGeneratorViewerState(
-  v: unknown,
-): v is GeneratorViewerState & {
-  $type: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
-} {
-  return is$typed(v, id, 'generatorViewerState')
+const hashGeneratorViewerState = 'generatorViewerState'
+
+export function isGeneratorViewerState<V>(v: V) {
+  return is$typed(v, id, hashGeneratorViewerState)
+}
+
+export function validateGeneratorViewerState<V>(v: V) {
+  return validate<GeneratorViewerState & V>(v, id, hashGeneratorViewerState)
 }
 
-export function validateGeneratorViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#generatorViewerState`,
-    v,
-  ) as ValidationResult<GeneratorViewerState>
+export function isValidGeneratorViewerState<V>(v: V) {
+  return isValid<GeneratorViewerState>(v, id, hashGeneratorViewerState)
 }
 
 export interface SkeletonFeedPost {
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
   post: string
   reason?:
-    | SkeletonReasonRepost
-    | SkeletonReasonPin
-    | { $type: string; [k: string]: unknown }
+    | $Typed<SkeletonReasonRepost>
+    | $Typed<SkeletonReasonPin>
+    | { $type: string }
   /** Context that will be passed through to client and may be passed to feed generator back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(
-  v: unknown,
-): v is SkeletonFeedPost & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
-} {
-  return is$typed(v, id, 'skeletonFeedPost')
+const hashSkeletonFeedPost = 'skeletonFeedPost'
+
+export function isSkeletonFeedPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonFeedPost)
+}
+
+export function validateSkeletonFeedPost<V>(v: V) {
+  return validate<SkeletonFeedPost & V>(v, id, hashSkeletonFeedPost)
 }
 
-export function validateSkeletonFeedPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonFeedPost`,
-    v,
-  ) as ValidationResult<SkeletonFeedPost>
+export function isValidSkeletonFeedPost<V>(v: V) {
+  return isValid<SkeletonFeedPost>(v, id, hashSkeletonFeedPost)
 }
 
 export interface SkeletonReasonRepost {
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
   repost: string
-  [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(
-  v: unknown,
-): v is SkeletonReasonRepost & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
-} {
-  return is$typed(v, id, 'skeletonReasonRepost')
+const hashSkeletonReasonRepost = 'skeletonReasonRepost'
+
+export function isSkeletonReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonRepost)
+}
+
+export function validateSkeletonReasonRepost<V>(v: V) {
+  return validate<SkeletonReasonRepost & V>(v, id, hashSkeletonReasonRepost)
 }
 
-export function validateSkeletonReasonRepost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonReasonRepost`,
-    v,
-  ) as ValidationResult<SkeletonReasonRepost>
+export function isValidSkeletonReasonRepost<V>(v: V) {
+  return isValid<SkeletonReasonRepost>(v, id, hashSkeletonReasonRepost)
 }
 
 export interface SkeletonReasonPin {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
+}
+
+const hashSkeletonReasonPin = 'skeletonReasonPin'
+
+export function isSkeletonReasonPin<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonPin)
 }
 
-export function isSkeletonReasonPin(
-  v: unknown,
-): v is SkeletonReasonPin & {
-  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
-} {
-  return is$typed(v, id, 'skeletonReasonPin')
+export function validateSkeletonReasonPin<V>(v: V) {
+  return validate<SkeletonReasonPin & V>(v, id, hashSkeletonReasonPin)
 }
 
-export function validateSkeletonReasonPin(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonReasonPin`,
-    v,
-  ) as ValidationResult<SkeletonReasonPin>
+export function isValidSkeletonReasonPin<V>(v: V) {
+  return isValid<SkeletonReasonPin>(v, id, hashSkeletonReasonPin)
 }
 
 export interface ThreadgateView {
+  $type?: $Type<'app.bsky.feed.defs', 'threadgateView'>
   uri?: string
   cid?: string
-  record?: {}
+  record?: { [_ in string]: unknown }
   lists?: AppBskyGraphDefs.ListViewBasic[]
-  [k: string]: unknown
 }
 
-export function isThreadgateView(
-  v: unknown,
-): v is ThreadgateView & {
-  $type: $Type<'app.bsky.feed.defs', 'threadgateView'>
-} {
-  return is$typed(v, id, 'threadgateView')
+const hashThreadgateView = 'threadgateView'
+
+export function isThreadgateView<V>(v: V) {
+  return is$typed(v, id, hashThreadgateView)
+}
+
+export function validateThreadgateView<V>(v: V) {
+  return validate<ThreadgateView & V>(v, id, hashThreadgateView)
 }
 
-export function validateThreadgateView(v: unknown) {
-  return lexicons.validate(
-    `${id}#threadgateView`,
-    v,
-  ) as ValidationResult<ThreadgateView>
+export function isValidThreadgateView<V>(v: V) {
+  return isValid<ThreadgateView>(v, id, hashThreadgateView)
 }
 
 export interface Interaction {
+  $type?: $Type<'app.bsky.feed.defs', 'interaction'>
   item?: string
   event?:
     | 'app.bsky.feed.defs#requestLess'
@@ -403,20 +419,20 @@ export interface Interaction {
     | (string & {})
   /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isInteraction(
-  v: unknown,
-): v is Interaction & { $type: $Type<'app.bsky.feed.defs', 'interaction'> } {
-  return is$typed(v, id, 'interaction')
+const hashInteraction = 'interaction'
+
+export function isInteraction<V>(v: V) {
+  return is$typed(v, id, hashInteraction)
+}
+
+export function validateInteraction<V>(v: V) {
+  return validate<Interaction & V>(v, id, hashInteraction)
 }
 
-export function validateInteraction(v: unknown) {
-  return lexicons.validate(
-    `${id}#interaction`,
-    v,
-  ) as ValidationResult<Interaction>
+export function isValidInteraction<V>(v: V) {
+  return isValid<Interaction>(v, id, hashInteraction)
 }
 
 /** Request that less content like the given feed item be shown in the feed */
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index b76b12a9e41..10f46121fee 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.describeFeedGenerator'
 
 export interface QueryParams {}
@@ -18,7 +24,6 @@ export interface OutputSchema {
   did: string
   feeds: Feed[]
   links?: Links
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -47,34 +52,40 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Feed {
+  $type?: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeed(
-  v: unknown,
-): v is Feed & { $type: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'> } {
-  return is$typed(v, id, 'feed')
+const hashFeed = 'feed'
+
+export function isFeed<V>(v: V) {
+  return is$typed(v, id, hashFeed)
+}
+
+export function validateFeed<V>(v: V) {
+  return validate<Feed & V>(v, id, hashFeed)
 }
 
-export function validateFeed(v: unknown) {
-  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
+export function isValidFeed<V>(v: V) {
+  return isValid<Feed>(v, id, hashFeed)
 }
 
 export interface Links {
+  $type?: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(
-  v: unknown,
-): v is Links & {
-  $type: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
-} {
-  return is$typed(v, id, 'links')
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
+}
+
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown) {
-  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
+export function isValidLinks<V>(v: V) {
+  return isValid<Links>(v, id, hashLinks)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
index 2fac60cbf6e..9c7a3fc0d62 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.generator'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.generator', 'main'>
   did: string
   displayName: string
   description?: string
@@ -18,19 +25,21 @@ export interface Record {
   avatar?: BlobRef
   /** Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions */
   acceptsInteractions?: boolean
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.generator', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index a680bebbc7e..0dfc3b407bc 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getActorFeeds'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index 5d2852087d7..ef497af6abb 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getActorLikes'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 7719ac0368a..d0f6e778bfa 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getAuthorFeed'
 
 export interface QueryParams {
@@ -30,7 +36,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
index 9224f829059..9e2fa1a11a0 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeed'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index c3981ea75b4..a742ec87ff0 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedGenerator'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export interface OutputSchema {
   isOnline: boolean
   /** Indicates whether the feed generator service is compatible with the record declaration. */
   isValid: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 4745177b4b5..43806b8e4e2 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedGenerators'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index 07eba8c59f4..abce42e5850 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getFeedSkeleton'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.SkeletonFeedPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
index 190905772f5..629f1375eaf 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getLikes'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   likes: Like[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -56,18 +61,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Like {
+  $type?: $Type<'app.bsky.feed.getLikes', 'like'>
   indexedAt: string
   createdAt: string
   actor: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isLike(
-  v: unknown,
-): v is Like & { $type: $Type<'app.bsky.feed.getLikes', 'like'> } {
-  return is$typed(v, id, 'like')
+const hashLike = 'like'
+
+export function isLike<V>(v: V) {
+  return is$typed(v, id, hashLike)
+}
+
+export function validateLike<V>(v: V) {
+  return validate<Like & V>(v, id, hashLike)
 }
 
-export function validateLike(v: unknown) {
-  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
+export function isValidLike<V>(v: V) {
+  return isValid<Like>(v, id, hashLike)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
index a31bb6ddd62..067825731a3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getListFeed'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 444eac417c3..b9050722e41 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getPostThread'
 
 export interface QueryParams {
@@ -24,12 +30,11 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   thread:
-    | AppBskyFeedDefs.ThreadViewPost
-    | AppBskyFeedDefs.NotFoundPost
-    | AppBskyFeedDefs.BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedDefs.ThreadViewPost>
+    | $Typed<AppBskyFeedDefs.NotFoundPost>
+    | $Typed<AppBskyFeedDefs.BlockedPost>
+    | { $type: string }
   threadgate?: AppBskyFeedDefs.ThreadgateView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
index da6bf3696e2..02dffc9281c 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getPosts'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
index c71113bace2..51413c79fb1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getQuotes'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index 25bf3c8f81b..77b81b96561 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getRepostedBy'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   repostedBy: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index c34be54afdc..fbf789c54d6 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getSuggestedFeeds'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
index e3f1f0ce0bc..55b8acc1e7a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.getTimeline'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/like.ts b/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
index 17f3d126a33..08ede56a096 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.like'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.like', 'main'>
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.like', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/post.ts b/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
index cc632e3e4c8..8fcd72f9ac9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
@@ -3,20 +3,27 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyEmbedImages from '../embed/images'
+import type * as AppBskyEmbedVideo from '../embed/video'
+import type * as AppBskyEmbedExternal from '../embed/external'
+import type * as AppBskyEmbedRecord from '../embed/record'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.post'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.post', 'main'>
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
   /** DEPRECATED: replaced by app.bsky.richtext.facet. */
@@ -25,17 +32,15 @@ export interface Record {
   facets?: AppBskyRichtextFacet.Main[]
   reply?: ReplyRef
   embed?:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | AppBskyEmbedRecord.Main
-    | AppBskyEmbedRecordWithMedia.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | $Typed<AppBskyEmbedRecord.Main>
+    | $Typed<AppBskyEmbedRecordWithMedia.Main>
+    | { $type: string }
   /** Indicates human language of post primary text content. */
   langs?: string[]
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   /** Additional hashtags, in addition to any included in post text and facets. */
   tags?: string[]
   /** Client-declared timestamp when this post was originally created. */
@@ -43,64 +48,80 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.post', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 export interface ReplyRef {
+  $type?: $Type<'app.bsky.feed.post', 'replyRef'>
   root: ComAtprotoRepoStrongRef.Main
   parent: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isReplyRef(
-  v: unknown,
-): v is ReplyRef & { $type: $Type<'app.bsky.feed.post', 'replyRef'> } {
-  return is$typed(v, id, 'replyRef')
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
+}
+
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown) {
-  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
+export function isValidReplyRef<V>(v: V) {
+  return isValid<ReplyRef>(v, id, hashReplyRef)
 }
 
 /** Deprecated: use facets instead. */
 export interface Entity {
+  $type?: $Type<'app.bsky.feed.post', 'entity'>
   index: TextSlice
   /** Expected values are 'mention' and 'link'. */
   type: string
   value: string
-  [k: string]: unknown
 }
 
-export function isEntity(
-  v: unknown,
-): v is Entity & { $type: $Type<'app.bsky.feed.post', 'entity'> } {
-  return is$typed(v, id, 'entity')
+const hashEntity = 'entity'
+
+export function isEntity<V>(v: V) {
+  return is$typed(v, id, hashEntity)
+}
+
+export function validateEntity<V>(v: V) {
+  return validate<Entity & V>(v, id, hashEntity)
 }
 
-export function validateEntity(v: unknown) {
-  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
+export function isValidEntity<V>(v: V) {
+  return isValid<Entity>(v, id, hashEntity)
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
 export interface TextSlice {
+  $type?: $Type<'app.bsky.feed.post', 'textSlice'>
   start: number
   end: number
-  [k: string]: unknown
 }
 
-export function isTextSlice(
-  v: unknown,
-): v is TextSlice & { $type: $Type<'app.bsky.feed.post', 'textSlice'> } {
-  return is$typed(v, id, 'textSlice')
+const hashTextSlice = 'textSlice'
+
+export function isTextSlice<V>(v: V) {
+  return is$typed(v, id, hashTextSlice)
+}
+
+export function validateTextSlice<V>(v: V) {
+  return validate<TextSlice & V>(v, id, hashTextSlice)
 }
 
-export function validateTextSlice(v: unknown) {
-  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
+export function isValidTextSlice<V>(v: V) {
+  return isValid<TextSlice>(v, id, hashTextSlice)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
index 87273460b40..25e9d32ff8c 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -3,47 +3,57 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.postgate'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.postgate', 'main'>
   createdAt: string
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
-  embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
+  embeddingRules?: ($Typed<DisableRule> | { $type: string })[]
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.postgate', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 /** Disables embedding of this post. */
 export interface DisableRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.postgate', 'disableRule'>
+}
+
+const hashDisableRule = 'disableRule'
+
+export function isDisableRule<V>(v: V) {
+  return is$typed(v, id, hashDisableRule)
 }
 
-export function isDisableRule(
-  v: unknown,
-): v is DisableRule & {
-  $type: $Type<'app.bsky.feed.postgate', 'disableRule'>
-} {
-  return is$typed(v, id, 'disableRule')
+export function validateDisableRule<V>(v: V) {
+  return validate<DisableRule & V>(v, id, hashDisableRule)
 }
 
-export function validateDisableRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#disableRule`,
-    v,
-  ) as ValidationResult<DisableRule>
+export function isValidDisableRule<V>(v: V) {
+  return isValid<DisableRule>(v, id, hashDisableRule)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts b/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
index 0f1101898d5..f51561588c7 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.repost'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.repost', 'main'>
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.repost', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 50152c309ae..cf9e9fb5d2f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.searchPosts'
 
 export interface QueryParams {
@@ -44,7 +50,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index 59bc2c698b8..13fd5759447 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -4,23 +4,26 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.sendInteractions'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   interactions: AppBskyFeedDefs.Interaction[]
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
index 696de59da87..eefa35a8dab 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -3,19 +3,26 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
+  $type?: $Type<'app.bsky.feed.threadgate', 'main'>
   /** Reference (AT-URI) to the post record. */
   post: string
   allow?: (
-    | MentionRule
-    | FollowingRule
-    | ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MentionRule>
+    | $Typed<FollowingRule>
+    | $Typed<ListRule>
+    | { $type: string }
   )[]
   createdAt: string
   /** List of hidden reply URIs. */
@@ -23,68 +30,74 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.feed.threadgate', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 /** Allow replies from actors mentioned in your post. */
 export interface MentionRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
 }
 
-export function isMentionRule(
-  v: unknown,
-): v is MentionRule & {
-  $type: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
-} {
-  return is$typed(v, id, 'mentionRule')
+const hashMentionRule = 'mentionRule'
+
+export function isMentionRule<V>(v: V) {
+  return is$typed(v, id, hashMentionRule)
+}
+
+export function validateMentionRule<V>(v: V) {
+  return validate<MentionRule & V>(v, id, hashMentionRule)
 }
 
-export function validateMentionRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#mentionRule`,
-    v,
-  ) as ValidationResult<MentionRule>
+export function isValidMentionRule<V>(v: V) {
+  return isValid<MentionRule>(v, id, hashMentionRule)
 }
 
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
-  [k: string]: unknown
+  $type?: $Type<'app.bsky.feed.threadgate', 'followingRule'>
 }
 
-export function isFollowingRule(
-  v: unknown,
-): v is FollowingRule & {
-  $type: $Type<'app.bsky.feed.threadgate', 'followingRule'>
-} {
-  return is$typed(v, id, 'followingRule')
+const hashFollowingRule = 'followingRule'
+
+export function isFollowingRule<V>(v: V) {
+  return is$typed(v, id, hashFollowingRule)
+}
+
+export function validateFollowingRule<V>(v: V) {
+  return validate<FollowingRule & V>(v, id, hashFollowingRule)
 }
 
-export function validateFollowingRule(v: unknown) {
-  return lexicons.validate(
-    `${id}#followingRule`,
-    v,
-  ) as ValidationResult<FollowingRule>
+export function isValidFollowingRule<V>(v: V) {
+  return isValid<FollowingRule>(v, id, hashFollowingRule)
 }
 
 /** Allow replies from actors on a list. */
 export interface ListRule {
+  $type?: $Type<'app.bsky.feed.threadgate', 'listRule'>
   list: string
-  [k: string]: unknown
 }
 
-export function isListRule(
-  v: unknown,
-): v is ListRule & { $type: $Type<'app.bsky.feed.threadgate', 'listRule'> } {
-  return is$typed(v, id, 'listRule')
+const hashListRule = 'listRule'
+
+export function isListRule<V>(v: V) {
+  return is$typed(v, id, hashListRule)
+}
+
+export function validateListRule<V>(v: V) {
+  return validate<ListRule & V>(v, id, hashListRule)
 }
 
-export function validateListRule(v: unknown) {
-  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
+export function isValidListRule<V>(v: V) {
+  return isValid<ListRule>(v, id, hashListRule)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/block.ts b/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
index 167afdf2f9b..c10702a4403 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.block'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.block', 'main'>
   /** DID of the account to be blocked. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.block', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts b/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
index 44d1962de5e..52c8471a7d8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
@@ -3,16 +3,23 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyFeedDefs from '../feed/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as AppBskyFeedDefs from '../feed/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.defs'
 
 export interface ListViewBasic {
+  $type?: $Type<'app.bsky.graph.defs', 'listViewBasic'>
   uri: string
   cid: string
   name: string
@@ -22,25 +29,24 @@ export interface ListViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt?: string
-  [k: string]: unknown
 }
 
-export function isListViewBasic(
-  v: unknown,
-): v is ListViewBasic & {
-  $type: $Type<'app.bsky.graph.defs', 'listViewBasic'>
-} {
-  return is$typed(v, id, 'listViewBasic')
+const hashListViewBasic = 'listViewBasic'
+
+export function isListViewBasic<V>(v: V) {
+  return is$typed(v, id, hashListViewBasic)
+}
+
+export function validateListViewBasic<V>(v: V) {
+  return validate<ListViewBasic & V>(v, id, hashListViewBasic)
 }
 
-export function validateListViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#listViewBasic`,
-    v,
-  ) as ValidationResult<ListViewBasic>
+export function isValidListViewBasic<V>(v: V) {
+  return isValid<ListViewBasic>(v, id, hashListViewBasic)
 }
 
 export interface ListView {
+  $type?: $Type<'app.bsky.graph.defs', 'listView'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -53,42 +59,47 @@ export interface ListView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isListView(
-  v: unknown,
-): v is ListView & { $type: $Type<'app.bsky.graph.defs', 'listView'> } {
-  return is$typed(v, id, 'listView')
+const hashListView = 'listView'
+
+export function isListView<V>(v: V) {
+  return is$typed(v, id, hashListView)
+}
+
+export function validateListView<V>(v: V) {
+  return validate<ListView & V>(v, id, hashListView)
 }
 
-export function validateListView(v: unknown) {
-  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
+export function isValidListView<V>(v: V) {
+  return isValid<ListView>(v, id, hashListView)
 }
 
 export interface ListItemView {
+  $type?: $Type<'app.bsky.graph.defs', 'listItemView'>
   uri: string
   subject: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isListItemView(
-  v: unknown,
-): v is ListItemView & { $type: $Type<'app.bsky.graph.defs', 'listItemView'> } {
-  return is$typed(v, id, 'listItemView')
+const hashListItemView = 'listItemView'
+
+export function isListItemView<V>(v: V) {
+  return is$typed(v, id, hashListItemView)
+}
+
+export function validateListItemView<V>(v: V) {
+  return validate<ListItemView & V>(v, id, hashListItemView)
 }
 
-export function validateListItemView(v: unknown) {
-  return lexicons.validate(
-    `${id}#listItemView`,
-    v,
-  ) as ValidationResult<ListItemView>
+export function isValidListItemView<V>(v: V) {
+  return isValid<ListItemView>(v, id, hashListItemView)
 }
 
 export interface StarterPackView {
+  $type?: $Type<'app.bsky.graph.defs', 'starterPackView'>
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   list?: ListViewBasic
   listItemsSample?: ListItemView[]
@@ -97,50 +108,47 @@ export interface StarterPackView {
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackView(
-  v: unknown,
-): v is StarterPackView & {
-  $type: $Type<'app.bsky.graph.defs', 'starterPackView'>
-} {
-  return is$typed(v, id, 'starterPackView')
+const hashStarterPackView = 'starterPackView'
+
+export function isStarterPackView<V>(v: V) {
+  return is$typed(v, id, hashStarterPackView)
+}
+
+export function validateStarterPackView<V>(v: V) {
+  return validate<StarterPackView & V>(v, id, hashStarterPackView)
 }
 
-export function validateStarterPackView(v: unknown) {
-  return lexicons.validate(
-    `${id}#starterPackView`,
-    v,
-  ) as ValidationResult<StarterPackView>
+export function isValidStarterPackView<V>(v: V) {
+  return isValid<StarterPackView>(v, id, hashStarterPackView)
 }
 
 export interface StarterPackViewBasic {
+  $type?: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   listItemCount?: number
   joinedWeekCount?: number
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(
-  v: unknown,
-): v is StarterPackViewBasic & {
-  $type: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
-} {
-  return is$typed(v, id, 'starterPackViewBasic')
+const hashStarterPackViewBasic = 'starterPackViewBasic'
+
+export function isStarterPackViewBasic<V>(v: V) {
+  return is$typed(v, id, hashStarterPackViewBasic)
+}
+
+export function validateStarterPackViewBasic<V>(v: V) {
+  return validate<StarterPackViewBasic & V>(v, id, hashStarterPackViewBasic)
 }
 
-export function validateStarterPackViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#starterPackViewBasic`,
-    v,
-  ) as ValidationResult<StarterPackViewBasic>
+export function isValidStarterPackViewBasic<V>(v: V) {
+  return isValid<StarterPackViewBasic>(v, id, hashStarterPackViewBasic)
 }
 
 export type ListPurpose =
@@ -157,67 +165,66 @@ export const CURATELIST = `${id}#curatelist`
 export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
+  $type?: $Type<'app.bsky.graph.defs', 'listViewerState'>
   muted?: boolean
   blocked?: string
-  [k: string]: unknown
 }
 
-export function isListViewerState(
-  v: unknown,
-): v is ListViewerState & {
-  $type: $Type<'app.bsky.graph.defs', 'listViewerState'>
-} {
-  return is$typed(v, id, 'listViewerState')
+const hashListViewerState = 'listViewerState'
+
+export function isListViewerState<V>(v: V) {
+  return is$typed(v, id, hashListViewerState)
+}
+
+export function validateListViewerState<V>(v: V) {
+  return validate<ListViewerState & V>(v, id, hashListViewerState)
 }
 
-export function validateListViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#listViewerState`,
-    v,
-  ) as ValidationResult<ListViewerState>
+export function isValidListViewerState<V>(v: V) {
+  return isValid<ListViewerState>(v, id, hashListViewerState)
 }
 
 /** indicates that a handle or DID could not be resolved */
 export interface NotFoundActor {
+  $type?: $Type<'app.bsky.graph.defs', 'notFoundActor'>
   actor: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundActor(
-  v: unknown,
-): v is NotFoundActor & {
-  $type: $Type<'app.bsky.graph.defs', 'notFoundActor'>
-} {
-  return is$typed(v, id, 'notFoundActor')
+const hashNotFoundActor = 'notFoundActor'
+
+export function isNotFoundActor<V>(v: V) {
+  return is$typed(v, id, hashNotFoundActor)
+}
+
+export function validateNotFoundActor<V>(v: V) {
+  return validate<NotFoundActor & V>(v, id, hashNotFoundActor)
 }
 
-export function validateNotFoundActor(v: unknown) {
-  return lexicons.validate(
-    `${id}#notFoundActor`,
-    v,
-  ) as ValidationResult<NotFoundActor>
+export function isValidNotFoundActor<V>(v: V) {
+  return isValid<NotFoundActor>(v, id, hashNotFoundActor)
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
 export interface Relationship {
+  $type?: $Type<'app.bsky.graph.defs', 'relationship'>
   did: string
   /** if the actor follows this DID, this is the AT-URI of the follow record */
   following?: string
   /** if the actor is followed by this DID, contains the AT-URI of the follow record */
   followedBy?: string
-  [k: string]: unknown
 }
 
-export function isRelationship(
-  v: unknown,
-): v is Relationship & { $type: $Type<'app.bsky.graph.defs', 'relationship'> } {
-  return is$typed(v, id, 'relationship')
+const hashRelationship = 'relationship'
+
+export function isRelationship<V>(v: V) {
+  return is$typed(v, id, hashRelationship)
+}
+
+export function validateRelationship<V>(v: V) {
+  return validate<Relationship & V>(v, id, hashRelationship)
 }
 
-export function validateRelationship(v: unknown) {
-  return lexicons.validate(
-    `${id}#relationship`,
-    v,
-  ) as ValidationResult<Relationship>
+export function isValidRelationship<V>(v: V) {
+  return isValid<Relationship>(v, id, hashRelationship)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts b/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
index bb0f2d2dc3a..28c81906d31 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
@@ -3,23 +3,34 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.follow'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.follow', 'main'>
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.follow', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index ee9a8af4999..ba38795bf41 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getActorStarterPacks'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
index d353dc99267..5f4be16f2e8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getBlocks'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blocks: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
index a44fe4c7ca9..ea5db286f46 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getFollowers'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
index af3b8214783..c6455506ab7 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getFollows'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   follows: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index 0cdb01d99df..81669d4e12a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getKnownFollowers'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
index 444d463f7be..708ce31ce8e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getList'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export interface OutputSchema {
   cursor?: string
   list: AppBskyGraphDefs.ListView
   items: AppBskyGraphDefs.ListItemView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 2828969d77c..a754c83658f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getListBlocks'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 25fc22a45e7..e4f376d20cf 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getListMutes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
index 04c1e929899..e28505a47dd 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getLists'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
index fcfbadd3154..9b0d6c83b3b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getMutes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   mutes: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
index b169bc9de7e..e05732c84ad 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getRelationships'
 
 export interface QueryParams {
@@ -23,11 +29,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   actor?: string
   relationships: (
-    | AppBskyGraphDefs.Relationship
-    | AppBskyGraphDefs.NotFoundActor
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyGraphDefs.Relationship>
+    | $Typed<AppBskyGraphDefs.NotFoundActor>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index 906e412e1c5..69a882c3852 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getStarterPack'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPack: AppBskyGraphDefs.StarterPackView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 829cfa6bc94..bb7cfafe4c5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getStarterPacks'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index 7a59fd5716d..e5f1148f4f5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.getSuggestedFollowsByActor'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export interface OutputSchema {
   suggestions: AppBskyActorDefs.ProfileView[]
   /** If true, response has fallen-back to generic results, and is not scoped using relativeToDid */
   isFallback?: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/list.ts b/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
index 4fc99ad59d4..97bf1c00559 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
@@ -3,34 +3,43 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyGraphDefs from './defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.list'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.list', 'main'>
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
   name: string
   description?: string
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.list', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts b/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
index e159ed9b6d1..6ebd36c4cb3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -3,24 +3,35 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.listblock'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.listblock', 'main'>
   /** Reference (AT-URI) to the mod list record. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.listblock', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts b/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
index 164196cfc25..a3b7efb0eb1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.listitem'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.listitem', 'main'>
   /** The account which is included on the list. */
   subject: string
   /** Reference (AT-URI) to the list record (app.bsky.graph.list). */
@@ -17,12 +24,16 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.listitem', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
index aa9b7a1b950..7136480f8f3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteActor'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 0acc1da0dc2..30dabadfd2f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteActorList'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
index 552bff9572f..efb5dab9617 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.muteThread'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index 643bb579fe1..e7be70760c7 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.searchStarterPacks'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts b/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
index d7cb5b48930..66abf07fd50 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../richtext/facet'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.starterpack'
 
 export interface Record {
+  $type?: $Type<'app.bsky.graph.starterpack', 'main'>
   /** Display name for starter pack; can not be empty. */
   name: string
   description?: string
@@ -21,27 +28,35 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.graph.starterpack', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
 
 export interface FeedItem {
+  $type?: $Type<'app.bsky.graph.starterpack', 'feedItem'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeedItem(
-  v: unknown,
-): v is FeedItem & { $type: $Type<'app.bsky.graph.starterpack', 'feedItem'> } {
-  return is$typed(v, id, 'feedItem')
+const hashFeedItem = 'feedItem'
+
+export function isFeedItem<V>(v: V) {
+  return is$typed(v, id, hashFeedItem)
+}
+
+export function validateFeedItem<V>(v: V) {
+  return validate<FeedItem & V>(v, id, hashFeedItem)
 }
 
-export function validateFeedItem(v: unknown) {
-  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
+export function isValidFeedItem<V>(v: V) {
+  return isValid<FeedItem>(v, id, hashFeedItem)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index 74e02903ed7..21396a46451 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteActor'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 44fc69490f8..f25697e65ea 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteActorList'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 135db7e8e4f..d657979501c 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.graph.unmuteThread'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
index b59c8227d10..e0f2f945b4e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.defs'
 
 export interface LabelerView {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerView'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -18,23 +25,24 @@ export interface LabelerView {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerView(
-  v: unknown,
-): v is LabelerView & { $type: $Type<'app.bsky.labeler.defs', 'labelerView'> } {
-  return is$typed(v, id, 'labelerView')
+const hashLabelerView = 'labelerView'
+
+export function isLabelerView<V>(v: V) {
+  return is$typed(v, id, hashLabelerView)
+}
+
+export function validateLabelerView<V>(v: V) {
+  return validate<LabelerView & V>(v, id, hashLabelerView)
 }
 
-export function validateLabelerView(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerView`,
-    v,
-  ) as ValidationResult<LabelerView>
+export function isValidLabelerView<V>(v: V) {
+  return isValid<LabelerView>(v, id, hashLabelerView)
 }
 
 export interface LabelerViewDetailed {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -43,63 +51,59 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(
-  v: unknown,
-): v is LabelerViewDetailed & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
-} {
-  return is$typed(v, id, 'labelerViewDetailed')
+const hashLabelerViewDetailed = 'labelerViewDetailed'
+
+export function isLabelerViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewDetailed)
+}
+
+export function validateLabelerViewDetailed<V>(v: V) {
+  return validate<LabelerViewDetailed & V>(v, id, hashLabelerViewDetailed)
 }
 
-export function validateLabelerViewDetailed(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerViewDetailed`,
-    v,
-  ) as ValidationResult<LabelerViewDetailed>
+export function isValidLabelerViewDetailed<V>(v: V) {
+  return isValid<LabelerViewDetailed>(v, id, hashLabelerViewDetailed)
 }
 
 export interface LabelerViewerState {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
   like?: string
-  [k: string]: unknown
 }
 
-export function isLabelerViewerState(
-  v: unknown,
-): v is LabelerViewerState & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
-} {
-  return is$typed(v, id, 'labelerViewerState')
+const hashLabelerViewerState = 'labelerViewerState'
+
+export function isLabelerViewerState<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewerState)
+}
+
+export function validateLabelerViewerState<V>(v: V) {
+  return validate<LabelerViewerState & V>(v, id, hashLabelerViewerState)
 }
 
-export function validateLabelerViewerState(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerViewerState`,
-    v,
-  ) as ValidationResult<LabelerViewerState>
+export function isValidLabelerViewerState<V>(v: V) {
+  return isValid<LabelerViewerState>(v, id, hashLabelerViewerState)
 }
 
 export interface LabelerPolicies {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
   /** The label values which this labeler publishes. May include global or custom labels. */
   labelValues: ComAtprotoLabelDefs.LabelValue[]
   /** Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. */
   labelValueDefinitions?: ComAtprotoLabelDefs.LabelValueDefinition[]
-  [k: string]: unknown
 }
 
-export function isLabelerPolicies(
-  v: unknown,
-): v is LabelerPolicies & {
-  $type: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
-} {
-  return is$typed(v, id, 'labelerPolicies')
+const hashLabelerPolicies = 'labelerPolicies'
+
+export function isLabelerPolicies<V>(v: V) {
+  return is$typed(v, id, hashLabelerPolicies)
+}
+
+export function validateLabelerPolicies<V>(v: V) {
+  return validate<LabelerPolicies & V>(v, id, hashLabelerPolicies)
 }
 
-export function validateLabelerPolicies(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelerPolicies`,
-    v,
-  ) as ValidationResult<LabelerPolicies>
+export function isValidLabelerPolicies<V>(v: V) {
+  return isValid<LabelerPolicies>(v, id, hashLabelerPolicies)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
index c80da11262f..ec8efbba356 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyLabelerDefs from './defs'
+import type * as AppBskyLabelerDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.getServices'
 
 export interface QueryParams {
@@ -20,11 +26,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   views: (
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyLabelerDefs.LabelerViewDetailed>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
index 0abc40dc8d1..5973c2fd285 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
@@ -3,28 +3,37 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyLabelerDefs from './defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.labeler.service'
 
 export interface Record {
+  $type?: $Type<'app.bsky.labeler.service', 'main'>
   policies: AppBskyLabelerDefs.LabelerPolicies
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'app.bsky.labeler.service', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index d52044a760b..658b44090a5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.getUnreadCount'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   count: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 19a2dc35fb0..69e705fcf3c 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -4,12 +4,18 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.listNotifications'
 
 export interface QueryParams {
@@ -28,7 +34,6 @@ export interface OutputSchema {
   notifications: Notification[]
   priority?: boolean
   seenAt?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -57,6 +62,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Notification {
+  $type?: $Type<'app.bsky.notification.listNotifications', 'notification'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileView
@@ -71,24 +77,22 @@ export interface Notification {
     | 'starterpack-joined'
     | (string & {})
   reasonSubject?: string
-  record: {}
+  record: { [_ in string]: unknown }
   isRead: boolean
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isNotification(
-  v: unknown,
-): v is Notification & {
-  $type: $Type<'app.bsky.notification.listNotifications', 'notification'>
-} {
-  return is$typed(v, id, 'notification')
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
+}
+
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
 }
 
-export function validateNotification(v: unknown) {
-  return lexicons.validate(
-    `${id}#notification`,
-    v,
-  ) as ValidationResult<Notification>
+export function isValidNotification<V>(v: V) {
+  return isValid<Notification>(v, id, hashNotification)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 0b5a9f066ad..f741da70ab3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   priority: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
index 516babda578..8fe65463fed 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.registerPush'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   token: string
   platform: 'ios' | 'android' | 'web' | (string & {})
   appId: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 6312ceeaa15..7e374302fdd 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.notification.updateSeen'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   seenAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts b/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
index 0a14274b608..a73bef3f85a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -3,89 +3,115 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
+  $type?: $Type<'app.bsky.richtext.facet', 'main'>
   index: ByteSlice
-  features: (Mention | Link | Tag | { $type: string; [k: string]: unknown })[]
-  [k: string]: unknown
+  features: ($Typed<Mention> | $Typed<Link> | $Typed<Tag> | { $type: string })[]
+}
+
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'app.bsky.richtext.facet', 'main'> } {
-  return is$typed(v, id, 'main')
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
 export interface Mention {
+  $type?: $Type<'app.bsky.richtext.facet', 'mention'>
   did: string
-  [k: string]: unknown
 }
 
-export function isMention(
-  v: unknown,
-): v is Mention & { $type: $Type<'app.bsky.richtext.facet', 'mention'> } {
-  return is$typed(v, id, 'mention')
+const hashMention = 'mention'
+
+export function isMention<V>(v: V) {
+  return is$typed(v, id, hashMention)
+}
+
+export function validateMention<V>(v: V) {
+  return validate<Mention & V>(v, id, hashMention)
 }
 
-export function validateMention(v: unknown) {
-  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
+export function isValidMention<V>(v: V) {
+  return isValid<Mention>(v, id, hashMention)
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
 export interface Link {
+  $type?: $Type<'app.bsky.richtext.facet', 'link'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isLink(
-  v: unknown,
-): v is Link & { $type: $Type<'app.bsky.richtext.facet', 'link'> } {
-  return is$typed(v, id, 'link')
+const hashLink = 'link'
+
+export function isLink<V>(v: V) {
+  return is$typed(v, id, hashLink)
+}
+
+export function validateLink<V>(v: V) {
+  return validate<Link & V>(v, id, hashLink)
 }
 
-export function validateLink(v: unknown) {
-  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
+export function isValidLink<V>(v: V) {
+  return isValid<Link>(v, id, hashLink)
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
 export interface Tag {
+  $type?: $Type<'app.bsky.richtext.facet', 'tag'>
   tag: string
-  [k: string]: unknown
 }
 
-export function isTag(
-  v: unknown,
-): v is Tag & { $type: $Type<'app.bsky.richtext.facet', 'tag'> } {
-  return is$typed(v, id, 'tag')
+const hashTag = 'tag'
+
+export function isTag<V>(v: V) {
+  return is$typed(v, id, hashTag)
+}
+
+export function validateTag<V>(v: V) {
+  return validate<Tag & V>(v, id, hashTag)
 }
 
-export function validateTag(v: unknown) {
-  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
+export function isValidTag<V>(v: V) {
+  return isValid<Tag>(v, id, hashTag)
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
 export interface ByteSlice {
+  $type?: $Type<'app.bsky.richtext.facet', 'byteSlice'>
   byteStart: number
   byteEnd: number
-  [k: string]: unknown
 }
 
-export function isByteSlice(
-  v: unknown,
-): v is ByteSlice & { $type: $Type<'app.bsky.richtext.facet', 'byteSlice'> } {
-  return is$typed(v, id, 'byteSlice')
+const hashByteSlice = 'byteSlice'
+
+export function isByteSlice<V>(v: V) {
+  return is$typed(v, id, hashByteSlice)
+}
+
+export function validateByteSlice<V>(v: V) {
+  return validate<ByteSlice & V>(v, id, hashByteSlice)
 }
 
-export function validateByteSlice(v: unknown) {
-  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
+export function isValidByteSlice<V>(v: V) {
+  return isValid<ByteSlice>(v, id, hashByteSlice)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
index 415c1c30867..a4286c5222e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -3,90 +3,100 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(
-  v: unknown,
-): v is SkeletonSearchPost & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
-} {
-  return is$typed(v, id, 'skeletonSearchPost')
+const hashSkeletonSearchPost = 'skeletonSearchPost'
+
+export function isSkeletonSearchPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchPost)
 }
 
-export function validateSkeletonSearchPost(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchPost`,
-    v,
-  ) as ValidationResult<SkeletonSearchPost>
+export function validateSkeletonSearchPost<V>(v: V) {
+  return validate<SkeletonSearchPost & V>(v, id, hashSkeletonSearchPost)
+}
+
+export function isValidSkeletonSearchPost<V>(v: V) {
+  return isValid<SkeletonSearchPost>(v, id, hashSkeletonSearchPost)
 }
 
 export interface SkeletonSearchActor {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
   did: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(
-  v: unknown,
-): v is SkeletonSearchActor & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
-} {
-  return is$typed(v, id, 'skeletonSearchActor')
+const hashSkeletonSearchActor = 'skeletonSearchActor'
+
+export function isSkeletonSearchActor<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchActor)
 }
 
-export function validateSkeletonSearchActor(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchActor`,
-    v,
-  ) as ValidationResult<SkeletonSearchActor>
+export function validateSkeletonSearchActor<V>(v: V) {
+  return validate<SkeletonSearchActor & V>(v, id, hashSkeletonSearchActor)
+}
+
+export function isValidSkeletonSearchActor<V>(v: V) {
+  return isValid<SkeletonSearchActor>(v, id, hashSkeletonSearchActor)
 }
 
 export interface SkeletonSearchStarterPack {
+  $type?: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchStarterPack(
-  v: unknown,
-): v is SkeletonSearchStarterPack & {
-  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
-} {
-  return is$typed(v, id, 'skeletonSearchStarterPack')
+const hashSkeletonSearchStarterPack = 'skeletonSearchStarterPack'
+
+export function isSkeletonSearchStarterPack<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchStarterPack)
+}
+
+export function validateSkeletonSearchStarterPack<V>(v: V) {
+  return validate<SkeletonSearchStarterPack & V>(
+    v,
+    id,
+    hashSkeletonSearchStarterPack,
+  )
 }
 
-export function validateSkeletonSearchStarterPack(v: unknown) {
-  return lexicons.validate(
-    `${id}#skeletonSearchStarterPack`,
+export function isValidSkeletonSearchStarterPack<V>(v: V) {
+  return isValid<SkeletonSearchStarterPack>(
     v,
-  ) as ValidationResult<SkeletonSearchStarterPack>
+    id,
+    hashSkeletonSearchStarterPack,
+  )
 }
 
 export interface TrendingTopic {
+  $type?: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
   topic: string
   displayName?: string
   description?: string
   link: string
-  [k: string]: unknown
 }
 
-export function isTrendingTopic(
-  v: unknown,
-): v is TrendingTopic & {
-  $type: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
-} {
-  return is$typed(v, id, 'trendingTopic')
+const hashTrendingTopic = 'trendingTopic'
+
+export function isTrendingTopic<V>(v: V) {
+  return is$typed(v, id, hashTrendingTopic)
 }
 
-export function validateTrendingTopic(v: unknown) {
-  return lexicons.validate(
-    `${id}#trendingTopic`,
-    v,
-  ) as ValidationResult<TrendingTopic>
+export function validateTrendingTopic<V>(v: V) {
+  return validate<TrendingTopic & V>(v, id, hashTrendingTopic)
+}
+
+export function isValidTrendingTopic<V>(v: V) {
+  return isValid<TrendingTopic>(v, id, hashTrendingTopic)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index b9e45fd96ce..ee024aff1b5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getConfig'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   checkEmailConfirmed?: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 20a45bc5992..d2abd861e22 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from '../feed/defs'
+import type * as AppBskyFeedDefs from '../feed/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getPopularFeedGenerators'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index 579973036a5..6a58219d23f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
 
 export interface QueryParams {
@@ -27,7 +33,6 @@ export interface OutputSchema {
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
   /** DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer. */
   relativeToDid?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index 371350940f3..d5afe19e3bb 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getTaggedSuggestions'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   suggestions: Suggestion[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -45,23 +50,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Suggestion {
+  $type?: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
   tag: string
   subjectType: 'actor' | 'feed' | (string & {})
   subject: string
-  [k: string]: unknown
 }
 
-export function isSuggestion(
-  v: unknown,
-): v is Suggestion & {
-  $type: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
-} {
-  return is$typed(v, id, 'suggestion')
+const hashSuggestion = 'suggestion'
+
+export function isSuggestion<V>(v: V) {
+  return is$typed(v, id, hashSuggestion)
+}
+
+export function validateSuggestion<V>(v: V) {
+  return validate<Suggestion & V>(v, id, hashSuggestion)
 }
 
-export function validateSuggestion(v: unknown) {
-  return lexicons.validate(
-    `${id}#suggestion`,
-    v,
-  ) as ValidationResult<Suggestion>
+export function isValidSuggestion<V>(v: V) {
+  return isValid<Suggestion>(v, id, hashSuggestion)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 47a4ac1a5b0..c1eb890b669 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.getTrendingTopics'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   topics: AppBskyUnspeccedDefs.TrendingTopic[]
   suggested: AppBskyUnspeccedDefs.TrendingTopic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index b4206a089b9..a9c27fbef04 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchActorsSkeleton'
 
 export interface QueryParams {
@@ -30,7 +36,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index 16b2ff87428..9f5cd4aed0f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchPostsSkeleton'
 
 export interface QueryParams {
@@ -46,7 +52,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyUnspeccedDefs.SkeletonSearchPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index 6927713a2e4..db8a5a27aef 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
 
 export interface QueryParams {
@@ -28,7 +34,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   starterPacks: AppBskyUnspeccedDefs.SkeletonSearchStarterPack[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/defs.ts b/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
index 7b82931c46c..93ed16829ca 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
+  $type?: $Type<'app.bsky.video.defs', 'jobStatus'>
   jobId: string
   did: string
   /** The state of the video processing job. All values not listed as a known value indicate that the job is in process. */
@@ -18,15 +25,18 @@ export interface JobStatus {
   blob?: BlobRef
   error?: string
   message?: string
-  [k: string]: unknown
 }
 
-export function isJobStatus(
-  v: unknown,
-): v is JobStatus & { $type: $Type<'app.bsky.video.defs', 'jobStatus'> } {
-  return is$typed(v, id, 'jobStatus')
+const hashJobStatus = 'jobStatus'
+
+export function isJobStatus<V>(v: V) {
+  return is$typed(v, id, hashJobStatus)
+}
+
+export function validateJobStatus<V>(v: V) {
+  return validate<JobStatus & V>(v, id, hashJobStatus)
 }
 
-export function validateJobStatus(v: unknown) {
-  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
+export function isValidJobStatus<V>(v: V) {
+  return isValid<JobStatus>(v, id, hashJobStatus)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 6cea4453ace..71786a6b24d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.getJobStatus'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index e1a2c8a12f8..474a2917384 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.getUploadLimits'
 
 export interface QueryParams {}
@@ -20,7 +26,6 @@ export interface OutputSchema {
   remainingDailyBytes?: number
   message?: string
   error?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
index 85e0beeb811..da8834bc9cd 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -5,11 +5,17 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'app.bsky.video.uploadVideo'
 
 export interface QueryParams {}
@@ -18,7 +24,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
index 454bd9edf6f..745d97fc50a 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -3,22 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
+  $type?: $Type<'chat.bsky.actor.declaration', 'main'>
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'chat.bsky.actor.declaration', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
index 3b1627f0800..0a12bbedea1 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -3,14 +3,21 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
   did: string
   handle: string
   displayName?: string
@@ -20,20 +27,18 @@ export interface ProfileViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   /** Set to true when the actor cannot actively participate in converations */
   chatDisabled?: boolean
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(
-  v: unknown,
-): v is ProfileViewBasic & {
-  $type: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
-} {
-  return is$typed(v, id, 'profileViewBasic')
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
+}
+
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown) {
-  return lexicons.validate(
-    `${id}#profileViewBasic`,
-    v,
-  ) as ValidationResult<ProfileViewBasic>
+export function isValidProfileViewBasic<V>(v: V) {
+  return isValid<ProfileViewBasic>(v, id, hashProfileViewBasic)
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index c45ee77d22e..8de7d41b2cd 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -4,19 +4,23 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.deleteAccount'
 
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export type HandlerInput = undefined
 
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index aa37fb7e366..6768e9f518b 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.actor.exportAccountData'
 
 export interface QueryParams {}
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
index f7adb51d238..1b1a357aabc 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -3,237 +3,236 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
-import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
-import * as ChatBskyActorDefs from '../actor/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
+import type * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
+import type * as ChatBskyActorDefs from '../actor/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.defs'
 
 export interface MessageRef {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageRef'>
   did: string
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
-export function isMessageRef(
-  v: unknown,
-): v is MessageRef & { $type: $Type<'chat.bsky.convo.defs', 'messageRef'> } {
-  return is$typed(v, id, 'messageRef')
+const hashMessageRef = 'messageRef'
+
+export function isMessageRef<V>(v: V) {
+  return is$typed(v, id, hashMessageRef)
 }
 
-export function validateMessageRef(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageRef`,
-    v,
-  ) as ValidationResult<MessageRef>
+export function validateMessageRef<V>(v: V) {
+  return validate<MessageRef & V>(v, id, hashMessageRef)
+}
+
+export function isValidMessageRef<V>(v: V) {
+  return isValid<MessageRef>(v, id, hashMessageRef)
 }
 
 export interface MessageInput {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageInput'>
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.Main | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  embed?: $Typed<AppBskyEmbedRecord.Main> | { $type: string }
 }
 
-export function isMessageInput(
-  v: unknown,
-): v is MessageInput & {
-  $type: $Type<'chat.bsky.convo.defs', 'messageInput'>
-} {
-  return is$typed(v, id, 'messageInput')
+const hashMessageInput = 'messageInput'
+
+export function isMessageInput<V>(v: V) {
+  return is$typed(v, id, hashMessageInput)
 }
 
-export function validateMessageInput(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageInput`,
-    v,
-  ) as ValidationResult<MessageInput>
+export function validateMessageInput<V>(v: V) {
+  return validate<MessageInput & V>(v, id, hashMessageInput)
+}
+
+export function isValidMessageInput<V>(v: V) {
+  return isValid<MessageInput>(v, id, hashMessageInput)
 }
 
 export interface MessageView {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageView'>
   id: string
   rev: string
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.View | { $type: string; [k: string]: unknown }
+  embed?: $Typed<AppBskyEmbedRecord.View> | { $type: string }
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isMessageView(
-  v: unknown,
-): v is MessageView & { $type: $Type<'chat.bsky.convo.defs', 'messageView'> } {
-  return is$typed(v, id, 'messageView')
+const hashMessageView = 'messageView'
+
+export function isMessageView<V>(v: V) {
+  return is$typed(v, id, hashMessageView)
+}
+
+export function validateMessageView<V>(v: V) {
+  return validate<MessageView & V>(v, id, hashMessageView)
 }
 
-export function validateMessageView(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageView`,
-    v,
-  ) as ValidationResult<MessageView>
+export function isValidMessageView<V>(v: V) {
+  return isValid<MessageView>(v, id, hashMessageView)
 }
 
 export interface DeletedMessageView {
+  $type?: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
   id: string
   rev: string
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isDeletedMessageView(
-  v: unknown,
-): v is DeletedMessageView & {
-  $type: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
-} {
-  return is$typed(v, id, 'deletedMessageView')
+const hashDeletedMessageView = 'deletedMessageView'
+
+export function isDeletedMessageView<V>(v: V) {
+  return is$typed(v, id, hashDeletedMessageView)
 }
 
-export function validateDeletedMessageView(v: unknown) {
-  return lexicons.validate(
-    `${id}#deletedMessageView`,
-    v,
-  ) as ValidationResult<DeletedMessageView>
+export function validateDeletedMessageView<V>(v: V) {
+  return validate<DeletedMessageView & V>(v, id, hashDeletedMessageView)
+}
+
+export function isValidDeletedMessageView<V>(v: V) {
+  return isValid<DeletedMessageView>(v, id, hashDeletedMessageView)
 }
 
 export interface MessageViewSender {
+  $type?: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
   did: string
-  [k: string]: unknown
 }
 
-export function isMessageViewSender(
-  v: unknown,
-): v is MessageViewSender & {
-  $type: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
-} {
-  return is$typed(v, id, 'messageViewSender')
+const hashMessageViewSender = 'messageViewSender'
+
+export function isMessageViewSender<V>(v: V) {
+  return is$typed(v, id, hashMessageViewSender)
 }
 
-export function validateMessageViewSender(v: unknown) {
-  return lexicons.validate(
-    `${id}#messageViewSender`,
-    v,
-  ) as ValidationResult<MessageViewSender>
+export function validateMessageViewSender<V>(v: V) {
+  return validate<MessageViewSender & V>(v, id, hashMessageViewSender)
+}
+
+export function isValidMessageViewSender<V>(v: V) {
+  return isValid<MessageViewSender>(v, id, hashMessageViewSender)
 }
 
 export interface ConvoView {
+  $type?: $Type<'chat.bsky.convo.defs', 'convoView'>
   id: string
   rev: string
   members: ChatBskyActorDefs.ProfileViewBasic[]
   lastMessage?:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MessageView>
+    | $Typed<DeletedMessageView>
+    | { $type: string }
   muted: boolean
   opened?: boolean
   unreadCount: number
-  [k: string]: unknown
 }
 
-export function isConvoView(
-  v: unknown,
-): v is ConvoView & { $type: $Type<'chat.bsky.convo.defs', 'convoView'> } {
-  return is$typed(v, id, 'convoView')
+const hashConvoView = 'convoView'
+
+export function isConvoView<V>(v: V) {
+  return is$typed(v, id, hashConvoView)
 }
 
-export function validateConvoView(v: unknown) {
-  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
+export function validateConvoView<V>(v: V) {
+  return validate<ConvoView & V>(v, id, hashConvoView)
+}
+
+export function isValidConvoView<V>(v: V) {
+  return isValid<ConvoView>(v, id, hashConvoView)
 }
 
 export interface LogBeginConvo {
+  $type?: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogBeginConvo(
-  v: unknown,
-): v is LogBeginConvo & {
-  $type: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
-} {
-  return is$typed(v, id, 'logBeginConvo')
+const hashLogBeginConvo = 'logBeginConvo'
+
+export function isLogBeginConvo<V>(v: V) {
+  return is$typed(v, id, hashLogBeginConvo)
 }
 
-export function validateLogBeginConvo(v: unknown) {
-  return lexicons.validate(
-    `${id}#logBeginConvo`,
-    v,
-  ) as ValidationResult<LogBeginConvo>
+export function validateLogBeginConvo<V>(v: V) {
+  return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
+}
+
+export function isValidLogBeginConvo<V>(v: V) {
+  return isValid<LogBeginConvo>(v, id, hashLogBeginConvo)
 }
 
 export interface LogLeaveConvo {
+  $type?: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogLeaveConvo(
-  v: unknown,
-): v is LogLeaveConvo & {
-  $type: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
-} {
-  return is$typed(v, id, 'logLeaveConvo')
+const hashLogLeaveConvo = 'logLeaveConvo'
+
+export function isLogLeaveConvo<V>(v: V) {
+  return is$typed(v, id, hashLogLeaveConvo)
 }
 
-export function validateLogLeaveConvo(v: unknown) {
-  return lexicons.validate(
-    `${id}#logLeaveConvo`,
-    v,
-  ) as ValidationResult<LogLeaveConvo>
+export function validateLogLeaveConvo<V>(v: V) {
+  return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
+}
+
+export function isValidLogLeaveConvo<V>(v: V) {
+  return isValid<LogLeaveConvo>(v, id, hashLogLeaveConvo)
 }
 
 export interface LogCreateMessage {
+  $type?: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogCreateMessage(
-  v: unknown,
-): v is LogCreateMessage & {
-  $type: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
-} {
-  return is$typed(v, id, 'logCreateMessage')
+const hashLogCreateMessage = 'logCreateMessage'
+
+export function isLogCreateMessage<V>(v: V) {
+  return is$typed(v, id, hashLogCreateMessage)
 }
 
-export function validateLogCreateMessage(v: unknown) {
-  return lexicons.validate(
-    `${id}#logCreateMessage`,
-    v,
-  ) as ValidationResult<LogCreateMessage>
+export function validateLogCreateMessage<V>(v: V) {
+  return validate<LogCreateMessage & V>(v, id, hashLogCreateMessage)
+}
+
+export function isValidLogCreateMessage<V>(v: V) {
+  return isValid<LogCreateMessage>(v, id, hashLogCreateMessage)
 }
 
 export interface LogDeleteMessage {
+  $type?: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
-}
-
-export function isLogDeleteMessage(
-  v: unknown,
-): v is LogDeleteMessage & {
-  $type: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
-} {
-  return is$typed(v, id, 'logDeleteMessage')
-}
-
-export function validateLogDeleteMessage(v: unknown) {
-  return lexicons.validate(
-    `${id}#logDeleteMessage`,
-    v,
-  ) as ValidationResult<LogDeleteMessage>
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
+}
+
+const hashLogDeleteMessage = 'logDeleteMessage'
+
+export function isLogDeleteMessage<V>(v: V) {
+  return is$typed(v, id, hashLogDeleteMessage)
+}
+
+export function validateLogDeleteMessage<V>(v: V) {
+  return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
+}
+
+export function isValidLogDeleteMessage<V>(v: V) {
+  return isValid<LogDeleteMessage>(v, id, hashLogDeleteMessage)
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index 4364c075ecd..e12b2d43889 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.deleteMessageForSelf'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.DeletedMessageView
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
index 7563c777197..71014d1779b 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getConvo'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index d7a1a69bb13..29f60bfb9ae 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getConvoForMembers'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
index 47f28623631..743e74fd7d2 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getLog'
 
 export interface QueryParams {
@@ -20,13 +26,12 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   logs: (
-    | ChatBskyConvoDefs.LogBeginConvo
-    | ChatBskyConvoDefs.LogLeaveConvo
-    | ChatBskyConvoDefs.LogCreateMessage
-    | ChatBskyConvoDefs.LogDeleteMessage
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
+    | $Typed<ChatBskyConvoDefs.LogCreateMessage>
+    | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
index 68f9331fdef..f32d67836cf 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.getMessages'
 
 export interface QueryParams {
@@ -22,11 +28,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 67a3e3a141c..2e221f8574c 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.leaveConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convoId: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 5829bd5b899..07e35ea50ae 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.listConvos'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   convos: ChatBskyConvoDefs.ConvoView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index c12e1df0238..a510f259225 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.muteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index 6ac463db74c..b0e65cacaaa 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.sendMessage'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.MessageView
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index 1e34fdc658f..d432ca6776a 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.sendMessageBatch'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   items: BatchItem[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   items: ChatBskyConvoDefs.MessageView[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -52,19 +56,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface BatchItem {
+  $type?: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
-export function isBatchItem(
-  v: unknown,
-): v is BatchItem & {
-  $type: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
-} {
-  return is$typed(v, id, 'batchItem')
+const hashBatchItem = 'batchItem'
+
+export function isBatchItem<V>(v: V) {
+  return is$typed(v, id, hashBatchItem)
+}
+
+export function validateBatchItem<V>(v: V) {
+  return validate<BatchItem & V>(v, id, hashBatchItem)
 }
 
-export function validateBatchItem(v: unknown) {
-  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
+export function isValidBatchItem<V>(v: V) {
+  return isValid<BatchItem>(v, id, hashBatchItem)
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index 03188d2bbd2..abf20d15e45 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -4,23 +4,27 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.unmuteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
index 8b7440714c0..562def1ec75 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.convo.updateRead'
 
 export interface QueryParams {}
@@ -16,12 +22,10 @@ export interface QueryParams {}
 export interface InputSchema {
   convoId: string
   messageId?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index bee28aeadad..991b6abf085 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.getActorMetadata'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export interface OutputSchema {
   day: Metadata
   month: Metadata
   all: Metadata
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,21 +54,23 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Metadata {
+  $type?: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
   messagesSent: number
   messagesReceived: number
   convos: number
   convosStarted: number
-  [k: string]: unknown
 }
 
-export function isMetadata(
-  v: unknown,
-): v is Metadata & {
-  $type: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
-} {
-  return is$typed(v, id, 'metadata')
+const hashMetadata = 'metadata'
+
+export function isMetadata<V>(v: V) {
+  return is$typed(v, id, hashMetadata)
+}
+
+export function validateMetadata<V>(v: V) {
+  return validate<Metadata & V>(v, id, hashMetadata)
 }
 
-export function validateMetadata(v: unknown) {
-  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
+export function isValidMetadata<V>(v: V) {
+  return isValid<Metadata>(v, id, hashMetadata)
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index a24045586b0..6426d17b62c 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from '../convo/defs'
+import type * as ChatBskyConvoDefs from '../convo/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.getMessageContext'
 
 export interface QueryParams {
@@ -23,11 +29,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index 2493a8063be..4caae41a9dd 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'chat.bsky.moderation.updateActorAccess'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   actor: string
   allowAccess: boolean
   ref?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts b/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
index bdda35afb96..83f247d978c 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
@@ -3,36 +3,44 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoServerDefs from '../server/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from '../server/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.defs'
 
 export interface StatusAttr {
+  $type?: $Type<'com.atproto.admin.defs', 'statusAttr'>
   applied: boolean
   ref?: string
-  [k: string]: unknown
 }
 
-export function isStatusAttr(
-  v: unknown,
-): v is StatusAttr & { $type: $Type<'com.atproto.admin.defs', 'statusAttr'> } {
-  return is$typed(v, id, 'statusAttr')
+const hashStatusAttr = 'statusAttr'
+
+export function isStatusAttr<V>(v: V) {
+  return is$typed(v, id, hashStatusAttr)
+}
+
+export function validateStatusAttr<V>(v: V) {
+  return validate<StatusAttr & V>(v, id, hashStatusAttr)
 }
 
-export function validateStatusAttr(v: unknown) {
-  return lexicons.validate(
-    `${id}#statusAttr`,
-    v,
-  ) as ValidationResult<StatusAttr>
+export function isValidStatusAttr<V>(v: V) {
+  return isValid<StatusAttr>(v, id, hashStatusAttr)
 }
 
 export interface AccountView {
+  $type?: $Type<'com.atproto.admin.defs', 'accountView'>
   did: string
   handle: string
   email?: string
-  relatedRecords?: {}[]
+  relatedRecords?: { [_ in string]: unknown }[]
   indexedAt: string
   invitedBy?: ComAtprotoServerDefs.InviteCode
   invites?: ComAtprotoServerDefs.InviteCode[]
@@ -41,78 +49,78 @@ export interface AccountView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isAccountView(
-  v: unknown,
-): v is AccountView & {
-  $type: $Type<'com.atproto.admin.defs', 'accountView'>
-} {
-  return is$typed(v, id, 'accountView')
+const hashAccountView = 'accountView'
+
+export function isAccountView<V>(v: V) {
+  return is$typed(v, id, hashAccountView)
+}
+
+export function validateAccountView<V>(v: V) {
+  return validate<AccountView & V>(v, id, hashAccountView)
 }
 
-export function validateAccountView(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountView`,
-    v,
-  ) as ValidationResult<AccountView>
+export function isValidAccountView<V>(v: V) {
+  return isValid<AccountView>(v, id, hashAccountView)
 }
 
 export interface RepoRef {
+  $type?: $Type<'com.atproto.admin.defs', 'repoRef'>
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoRef(
-  v: unknown,
-): v is RepoRef & { $type: $Type<'com.atproto.admin.defs', 'repoRef'> } {
-  return is$typed(v, id, 'repoRef')
+const hashRepoRef = 'repoRef'
+
+export function isRepoRef<V>(v: V) {
+  return is$typed(v, id, hashRepoRef)
+}
+
+export function validateRepoRef<V>(v: V) {
+  return validate<RepoRef & V>(v, id, hashRepoRef)
 }
 
-export function validateRepoRef(v: unknown) {
-  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
+export function isValidRepoRef<V>(v: V) {
+  return isValid<RepoRef>(v, id, hashRepoRef)
 }
 
 export interface RepoBlobRef {
+  $type?: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
   did: string
   cid: string
   recordUri?: string
-  [k: string]: unknown
 }
 
-export function isRepoBlobRef(
-  v: unknown,
-): v is RepoBlobRef & {
-  $type: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
-} {
-  return is$typed(v, id, 'repoBlobRef')
+const hashRepoBlobRef = 'repoBlobRef'
+
+export function isRepoBlobRef<V>(v: V) {
+  return is$typed(v, id, hashRepoBlobRef)
+}
+
+export function validateRepoBlobRef<V>(v: V) {
+  return validate<RepoBlobRef & V>(v, id, hashRepoBlobRef)
 }
 
-export function validateRepoBlobRef(v: unknown) {
-  return lexicons.validate(
-    `${id}#repoBlobRef`,
-    v,
-  ) as ValidationResult<RepoBlobRef>
+export function isValidRepoBlobRef<V>(v: V) {
+  return isValid<RepoBlobRef>(v, id, hashRepoBlobRef)
 }
 
 export interface ThreatSignature {
+  $type?: $Type<'com.atproto.admin.defs', 'threatSignature'>
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isThreatSignature(
-  v: unknown,
-): v is ThreatSignature & {
-  $type: $Type<'com.atproto.admin.defs', 'threatSignature'>
-} {
-  return is$typed(v, id, 'threatSignature')
+const hashThreatSignature = 'threatSignature'
+
+export function isThreatSignature<V>(v: V) {
+  return is$typed(v, id, hashThreatSignature)
+}
+
+export function validateThreatSignature<V>(v: V) {
+  return validate<ThreatSignature & V>(v, id, hashThreatSignature)
 }
 
-export function validateThreatSignature(v: unknown) {
-  return lexicons.validate(
-    `${id}#threatSignature`,
-    v,
-  ) as ValidationResult<ThreatSignature>
+export function isValidThreatSignature<V>(v: V) {
+  return isValid<ThreatSignature>(v, id, hashThreatSignature)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 1acca2e1dab..68ebad488ae 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.deleteAccount'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index d36f19ceb36..b31a5692d40 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.disableAccountInvites'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for disabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 9a9db8e9659..75f5d78cc2f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.disableInviteCodes'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   codes?: string[]
   accounts?: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index a9e226a8e5d..e851600390b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.enableAccountInvites'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for enabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index 0cf60326ea3..3add811cb52 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getAccountInfo'
 
 export interface QueryParams {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index fb5c83de25a..4db2f194690 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getAccountInfos'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   infos: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index 80d9487ee8b..5e483dc9583 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from '../server/defs'
+import type * as ComAtprotoServerDefs from '../server/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getInviteCodes'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index 21448f88d6b..e002259fa45 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -4,12 +4,18 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.getSubjectStatus'
 
 export interface QueryParams {
@@ -22,13 +28,12 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 6a554d7c424..5cbfa12eca1 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.searchAccounts'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
index baad3c1ee1f..cbe8f4a4d51 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.sendEmail'
 
 export interface QueryParams {}
@@ -19,12 +25,10 @@ export interface InputSchema {
   senderDid: string
   /** Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers */
   comment?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   sent: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index e3aed0b58c9..d127b4b584d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountEmail'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   /** The handle or DID of the repo. */
   account: string
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index 67c54a3b9de..dcd7b1b134e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountHandle'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   did: string
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index c05879469c4..c8af71f908b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateAccountPassword'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   did: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index e6630229fc0..60986aec0c0 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -4,35 +4,39 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.admin.updateSubjectStatus'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 56ae83a87d4..535dda90897 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.getRecommendedDidCredentials'
 
 export interface QueryParams {}
@@ -18,9 +24,8 @@ export interface OutputSchema {
   /** Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. */
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index b687f9d01bc..ffcd1bf517a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.requestPlcOperationSignature'
 
 export interface QueryParams {}
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index c9e880b7cee..bf795a9ee96 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.resolveHandle'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index c648e5b7ddf..83a046b24a8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.signPlcOperation'
 
 export interface QueryParams {}
@@ -17,15 +23,13 @@ export interface InputSchema {
   token?: string
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface OutputSchema {
   /** A signed DID PLC operation. */
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 3af1814148c..81b238852f3 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.submitPlcOperation'
 
 export interface QueryParams {}
 
 export interface InputSchema {
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
index c54d951e25d..a03f412c8a2 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.identity.updateHandle'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** The new handle. */
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/label/defs.ts b/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
index 8b0bc71b198..07a0a5293cd 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
+  $type?: $Type<'com.atproto.label.defs', 'label'>
   /** The AT Protocol version of the label object. */
   ver?: number
   /** DID of the actor who created this label. */
@@ -28,57 +35,66 @@ export interface Label {
   exp?: string
   /** Signature of dag-cbor encoded label. */
   sig?: Uint8Array
-  [k: string]: unknown
 }
 
-export function isLabel(
-  v: unknown,
-): v is Label & { $type: $Type<'com.atproto.label.defs', 'label'> } {
-  return is$typed(v, id, 'label')
+const hashLabel = 'label'
+
+export function isLabel<V>(v: V) {
+  return is$typed(v, id, hashLabel)
 }
 
-export function validateLabel(v: unknown) {
-  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
+export function validateLabel<V>(v: V) {
+  return validate<Label & V>(v, id, hashLabel)
+}
+
+export function isValidLabel<V>(v: V) {
+  return isValid<Label>(v, id, hashLabel)
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
 export interface SelfLabels {
+  $type?: $Type<'com.atproto.label.defs', 'selfLabels'>
   values: SelfLabel[]
-  [k: string]: unknown
 }
 
-export function isSelfLabels(
-  v: unknown,
-): v is SelfLabels & { $type: $Type<'com.atproto.label.defs', 'selfLabels'> } {
-  return is$typed(v, id, 'selfLabels')
+const hashSelfLabels = 'selfLabels'
+
+export function isSelfLabels<V>(v: V) {
+  return is$typed(v, id, hashSelfLabels)
+}
+
+export function validateSelfLabels<V>(v: V) {
+  return validate<SelfLabels & V>(v, id, hashSelfLabels)
 }
 
-export function validateSelfLabels(v: unknown) {
-  return lexicons.validate(
-    `${id}#selfLabels`,
-    v,
-  ) as ValidationResult<SelfLabels>
+export function isValidSelfLabels<V>(v: V) {
+  return isValid<SelfLabels>(v, id, hashSelfLabels)
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
 export interface SelfLabel {
+  $type?: $Type<'com.atproto.label.defs', 'selfLabel'>
   /** The short string name of the value or type of this label. */
   val: string
-  [k: string]: unknown
 }
 
-export function isSelfLabel(
-  v: unknown,
-): v is SelfLabel & { $type: $Type<'com.atproto.label.defs', 'selfLabel'> } {
-  return is$typed(v, id, 'selfLabel')
+const hashSelfLabel = 'selfLabel'
+
+export function isSelfLabel<V>(v: V) {
+  return is$typed(v, id, hashSelfLabel)
 }
 
-export function validateSelfLabel(v: unknown) {
-  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
+export function validateSelfLabel<V>(v: V) {
+  return validate<SelfLabel & V>(v, id, hashSelfLabel)
+}
+
+export function isValidSelfLabel<V>(v: V) {
+  return isValid<SelfLabel>(v, id, hashSelfLabel)
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
 export interface LabelValueDefinition {
+  $type?: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
   /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
   identifier: string
   /** How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. */
@@ -90,48 +106,53 @@ export interface LabelValueDefinition {
   /** Does the user need to have adult content enabled in order to configure this label? */
   adultOnly?: boolean
   locales: LabelValueDefinitionStrings[]
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinition(
-  v: unknown,
-): v is LabelValueDefinition & {
-  $type: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
-} {
-  return is$typed(v, id, 'labelValueDefinition')
+const hashLabelValueDefinition = 'labelValueDefinition'
+
+export function isLabelValueDefinition<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinition)
 }
 
-export function validateLabelValueDefinition(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelValueDefinition`,
-    v,
-  ) as ValidationResult<LabelValueDefinition>
+export function validateLabelValueDefinition<V>(v: V) {
+  return validate<LabelValueDefinition & V>(v, id, hashLabelValueDefinition)
+}
+
+export function isValidLabelValueDefinition<V>(v: V) {
+  return isValid<LabelValueDefinition>(v, id, hashLabelValueDefinition)
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
 export interface LabelValueDefinitionStrings {
+  $type?: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
   /** The code of the language these strings are written in. */
   lang: string
   /** A short human-readable name for the label. */
   name: string
   /** A longer description of what the label means and why it might be applied. */
   description: string
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinitionStrings(
-  v: unknown,
-): v is LabelValueDefinitionStrings & {
-  $type: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
-} {
-  return is$typed(v, id, 'labelValueDefinitionStrings')
+const hashLabelValueDefinitionStrings = 'labelValueDefinitionStrings'
+
+export function isLabelValueDefinitionStrings<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinitionStrings)
+}
+
+export function validateLabelValueDefinitionStrings<V>(v: V) {
+  return validate<LabelValueDefinitionStrings & V>(
+    v,
+    id,
+    hashLabelValueDefinitionStrings,
+  )
 }
 
-export function validateLabelValueDefinitionStrings(v: unknown) {
-  return lexicons.validate(
-    `${id}#labelValueDefinitionStrings`,
+export function isValidLabelValueDefinitionStrings<V>(v: V) {
+  return isValid<LabelValueDefinitionStrings>(
     v,
-  ) as ValidationResult<LabelValueDefinitionStrings>
+    id,
+    hashLabelValueDefinitionStrings,
+  )
 }
 
 export type LabelValue =
diff --git a/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
index 62d114a2685..3303143287a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from './defs'
+import type * as ComAtprotoLabelDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.queryLabels'
 
 export interface QueryParams {
@@ -25,7 +31,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts b/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
index d09a2240b54..eab540ac06f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -3,12 +3,18 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
-import * as ComAtprotoLabelDefs from './defs'
+import type * as ComAtprotoLabelDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.label.subscribeLabels'
 
 export interface QueryParams {
@@ -16,10 +22,7 @@ export interface QueryParams {
   cursor?: number
 }
 
-export type OutputSchema =
-  | Labels
-  | Info
-  | { $type: string; [k: string]: unknown }
+export type OutputSchema = $Typed<Labels> | $Typed<Info> | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -33,35 +36,41 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => AsyncIterable<HandlerOutput>
 
 export interface Labels {
+  $type?: $Type<'com.atproto.label.subscribeLabels', 'labels'>
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabels(
-  v: unknown,
-): v is Labels & {
-  $type: $Type<'com.atproto.label.subscribeLabels', 'labels'>
-} {
-  return is$typed(v, id, 'labels')
+const hashLabels = 'labels'
+
+export function isLabels<V>(v: V) {
+  return is$typed(v, id, hashLabels)
+}
+
+export function validateLabels<V>(v: V) {
+  return validate<Labels & V>(v, id, hashLabels)
 }
 
-export function validateLabels(v: unknown) {
-  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
+export function isValidLabels<V>(v: V) {
+  return isValid<Labels>(v, id, hashLabels)
 }
 
 export interface Info {
+  $type?: $Type<'com.atproto.label.subscribeLabels', 'info'>
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(
-  v: unknown,
-): v is Info & { $type: $Type<'com.atproto.label.subscribeLabels', 'info'> } {
-  return is$typed(v, id, 'info')
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
+}
+
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown) {
-  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
+export function isValidInfo<V>(v: V) {
+  return isValid<Info>(v, id, hashInfo)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
index 5095d72d1fe..3cd0a38c3ce 100644
--- a/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -4,13 +4,19 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../admin/defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoModerationDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../admin/defs'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.moderation.createReport'
 
 export interface QueryParams {}
@@ -20,10 +26,9 @@ export interface InputSchema {
   /** Additional context about the content and violation. */
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
 }
 
 export interface OutputSchema {
@@ -31,12 +36,11 @@ export interface OutputSchema {
   reasonType: ComAtprotoModerationDefs.ReasonType
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   reportedBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
index ed67a387dd5..4e2c8e68cbb 100644
--- a/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -3,9 +3,15 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
index c1869f1de5a..458470300d7 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.applyWrites'
 
 export interface QueryParams {}
@@ -18,16 +24,18 @@ export interface InputSchema {
   repo: string
   /** Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
-  writes: (Create | Update | Delete)[]
+  writes: ($Typed<Create> | $Typed<Update> | $Typed<Delete>)[]
   /** If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  results?: (CreateResult | UpdateResult | DeleteResult)[]
-  [k: string]: unknown
+  results?: (
+    | $Typed<CreateResult>
+    | $Typed<UpdateResult>
+    | $Typed<DeleteResult>
+  )[]
 }
 
 export interface HandlerInput {
@@ -61,116 +69,125 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Operation which creates a new record. */
 export interface Create {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'create'>
   collection: string
   rkey?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isCreate(
-  v: unknown,
-): v is Create & { $type: $Type<'com.atproto.repo.applyWrites', 'create'> } {
-  return is$typed(v, id, 'create')
+const hashCreate = 'create'
+
+export function isCreate<V>(v: V) {
+  return is$typed(v, id, hashCreate)
+}
+
+export function validateCreate<V>(v: V) {
+  return validate<Create & V>(v, id, hashCreate)
 }
 
-export function validateCreate(v: unknown) {
-  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
+export function isValidCreate<V>(v: V) {
+  return isValid<Create>(v, id, hashCreate)
 }
 
 /** Operation which updates an existing record. */
 export interface Update {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'update'>
   collection: string
   rkey: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isUpdate(
-  v: unknown,
-): v is Update & { $type: $Type<'com.atproto.repo.applyWrites', 'update'> } {
-  return is$typed(v, id, 'update')
+const hashUpdate = 'update'
+
+export function isUpdate<V>(v: V) {
+  return is$typed(v, id, hashUpdate)
 }
 
-export function validateUpdate(v: unknown) {
-  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
+export function validateUpdate<V>(v: V) {
+  return validate<Update & V>(v, id, hashUpdate)
+}
+
+export function isValidUpdate<V>(v: V) {
+  return isValid<Update>(v, id, hashUpdate)
 }
 
 /** Operation which deletes an existing record. */
 export interface Delete {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'delete'>
   collection: string
   rkey: string
-  [k: string]: unknown
 }
 
-export function isDelete(
-  v: unknown,
-): v is Delete & { $type: $Type<'com.atproto.repo.applyWrites', 'delete'> } {
-  return is$typed(v, id, 'delete')
+const hashDelete = 'delete'
+
+export function isDelete<V>(v: V) {
+  return is$typed(v, id, hashDelete)
+}
+
+export function validateDelete<V>(v: V) {
+  return validate<Delete & V>(v, id, hashDelete)
 }
 
-export function validateDelete(v: unknown) {
-  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
+export function isValidDelete<V>(v: V) {
+  return isValid<Delete>(v, id, hashDelete)
 }
 
 export interface CreateResult {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'createResult'>
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isCreateResult(
-  v: unknown,
-): v is CreateResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'createResult'>
-} {
-  return is$typed(v, id, 'createResult')
+const hashCreateResult = 'createResult'
+
+export function isCreateResult<V>(v: V) {
+  return is$typed(v, id, hashCreateResult)
+}
+
+export function validateCreateResult<V>(v: V) {
+  return validate<CreateResult & V>(v, id, hashCreateResult)
 }
 
-export function validateCreateResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#createResult`,
-    v,
-  ) as ValidationResult<CreateResult>
+export function isValidCreateResult<V>(v: V) {
+  return isValid<CreateResult>(v, id, hashCreateResult)
 }
 
 export interface UpdateResult {
+  $type?: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isUpdateResult(
-  v: unknown,
-): v is UpdateResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
-} {
-  return is$typed(v, id, 'updateResult')
+const hashUpdateResult = 'updateResult'
+
+export function isUpdateResult<V>(v: V) {
+  return is$typed(v, id, hashUpdateResult)
 }
 
-export function validateUpdateResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#updateResult`,
-    v,
-  ) as ValidationResult<UpdateResult>
+export function validateUpdateResult<V>(v: V) {
+  return validate<UpdateResult & V>(v, id, hashUpdateResult)
+}
+
+export function isValidUpdateResult<V>(v: V) {
+  return isValid<UpdateResult>(v, id, hashUpdateResult)
 }
 
 export interface DeleteResult {
-  [k: string]: unknown
+  $type?: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
+}
+
+const hashDeleteResult = 'deleteResult'
+
+export function isDeleteResult<V>(v: V) {
+  return is$typed(v, id, hashDeleteResult)
 }
 
-export function isDeleteResult(
-  v: unknown,
-): v is DeleteResult & {
-  $type: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
-} {
-  return is$typed(v, id, 'deleteResult')
+export function validateDeleteResult<V>(v: V) {
+  return validate<DeleteResult & V>(v, id, hashDeleteResult)
 }
 
-export function validateDeleteResult(v: unknown) {
-  return lexicons.validate(
-    `${id}#deleteResult`,
-    v,
-  ) as ValidationResult<DeleteResult>
+export function isValidDeleteResult<V>(v: V) {
+  return isValid<DeleteResult>(v, id, hashDeleteResult)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
index b155d82b176..e5bb47d0cec 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.createRecord'
 
 export interface QueryParams {}
@@ -23,10 +29,9 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record itself. Must contain a $type field. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -34,7 +39,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts b/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
index eeb0b484b7e..960bb17d66d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
@@ -3,26 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
+  $type?: $Type<'com.atproto.repo.defs', 'commitMeta'>
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
-export function isCommitMeta(
-  v: unknown,
-): v is CommitMeta & { $type: $Type<'com.atproto.repo.defs', 'commitMeta'> } {
-  return is$typed(v, id, 'commitMeta')
+const hashCommitMeta = 'commitMeta'
+
+export function isCommitMeta<V>(v: V) {
+  return is$typed(v, id, hashCommitMeta)
+}
+
+export function validateCommitMeta<V>(v: V) {
+  return validate<CommitMeta & V>(v, id, hashCommitMeta)
 }
 
-export function validateCommitMeta(v: unknown) {
-  return lexicons.validate(
-    `${id}#commitMeta`,
-    v,
-  ) as ValidationResult<CommitMeta>
+export function isValidCommitMeta<V>(v: V) {
+  return isValid<CommitMeta>(v, id, hashCommitMeta)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index f285caa3e28..19a2b19d773 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.deleteRecord'
 
 export interface QueryParams {}
@@ -24,12 +30,10 @@ export interface InputSchema {
   swapRecord?: string
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
index b3774866513..9fb82939ef9 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.describeRepo'
 
 export interface QueryParams {
@@ -21,12 +27,11 @@ export interface OutputSchema {
   handle: string
   did: string
   /** The complete DID document for this account. */
-  didDoc: {}
+  didDoc: { [_ in string]: unknown }
   /** List of all the collections (NSIDs) for which this repo contains at least one record. */
   collections: string[]
   /** Indicates if handle is currently valid (resolves bi-directionally) */
   handleIsCorrect: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
index ff0baecfadd..473b15cc725 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.getRecord'
 
 export interface QueryParams {
@@ -26,8 +32,7 @@ export type InputSchema = undefined
 export interface OutputSchema {
   uri: string
   cid?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
index 3dfc0334549..aa9d2cb1664 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.importRepo'
 
 export interface QueryParams {}
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index 38dc6a63164..86da1a967b8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.listMissingBlobs'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blobs: RecordBlob[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,22 +54,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RecordBlob {
+  $type?: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
   cid: string
   recordUri: string
-  [k: string]: unknown
 }
 
-export function isRecordBlob(
-  v: unknown,
-): v is RecordBlob & {
-  $type: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
-} {
-  return is$typed(v, id, 'recordBlob')
+const hashRecordBlob = 'recordBlob'
+
+export function isRecordBlob<V>(v: V) {
+  return is$typed(v, id, hashRecordBlob)
+}
+
+export function validateRecordBlob<V>(v: V) {
+  return validate<RecordBlob & V>(v, id, hashRecordBlob)
 }
 
-export function validateRecordBlob(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordBlob`,
-    v,
-  ) as ValidationResult<RecordBlob>
+export function isValidRecordBlob<V>(v: V) {
+  return isValid<RecordBlob>(v, id, hashRecordBlob)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
index 51b1393b9a8..479a1507e2f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.listRecords'
 
 export interface QueryParams {
@@ -31,7 +37,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   records: Record[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -60,18 +65,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Record {
+  $type?: $Type<'com.atproto.repo.listRecords', 'record'>
   uri: string
   cid: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isRecord(
-  v: unknown,
-): v is Record & { $type: $Type<'com.atproto.repo.listRecords', 'record'> } {
-  return is$typed(v, id, 'record')
+const hashRecord = 'record'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown) {
-  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
index 427fcd8920d..d17ea9f9c14 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.putRecord'
 
 export interface QueryParams {}
@@ -23,12 +29,11 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record to write. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation */
   swapRecord?: string | null
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -36,7 +41,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts b/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
index a9298dcbe55..b4bb1c08e62 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -3,23 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
+  $type?: $Type<'com.atproto.repo.strongRef', 'main'>
   uri: string
   cid: string
-  [k: string]: unknown
 }
 
-export function isMain(
-  v: unknown,
-): v is Main & { $type: $Type<'com.atproto.repo.strongRef', 'main'> } {
-  return is$typed(v, id, 'main')
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
+}
+
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown) {
-  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 7fc4618b664..01ffeea7b62 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.repo.uploadBlob'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
index 886a33d1e19..b5f0669df24 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.activateAccount'
 
 export interface QueryParams {}
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index 730ec6aca5b..56dd73e28fa 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.checkAccountStatus'
 
 export interface QueryParams {}
@@ -24,7 +30,6 @@ export interface OutputSchema {
   privateStateValues: number
   expectedBlobs: number
   importedBlobs: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
index f681b0a1e2f..e128c603f53 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.confirmEmail'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   email: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
index bd033e64df2..82f4db53e8a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createAccount'
 
 export interface QueryParams {}
@@ -26,8 +32,7 @@ export interface InputSchema {
   /** DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. */
   recoveryKey?: string
   /** A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. */
-  plcOp?: {}
-  [k: string]: unknown
+  plcOp?: { [_ in string]: unknown }
 }
 
 /** Account login session returned on successful account creation. */
@@ -38,8 +43,7 @@ export interface OutputSchema {
   /** The DID of the new account. */
   did: string
   /** Complete DID document. */
-  didDoc?: {}
-  [k: string]: unknown
+  didDoc?: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 07028659ed2..9616711d2ad 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createAppPassword'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   name: string
   /** If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. */
   privileged?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = AppPassword
@@ -52,24 +57,23 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
   name: string
   password: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(
-  v: unknown,
-): v is AppPassword & {
-  $type: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
-} {
-  return is$typed(v, id, 'appPassword')
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
+}
+
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown) {
-  return lexicons.validate(
-    `${id}#appPassword`,
-    v,
-  ) as ValidationResult<AppPassword>
+export function isValidAppPassword<V>(v: V) {
+  return isValid<AppPassword>(v, id, hashAppPassword)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 27150f98e8a..cfba31bc08e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createInviteCode'
 
 export interface QueryParams {}
@@ -15,12 +21,10 @@ export interface QueryParams {}
 export interface InputSchema {
   useCount: number
   forAccount?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   code: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index 455201cdbc5..b6c739c5804 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createInviteCodes'
 
 export interface QueryParams {}
@@ -16,12 +22,10 @@ export interface InputSchema {
   codeCount: number
   useCount: number
   forAccounts?: string[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   codes: AccountCodes[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -53,22 +57,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AccountCodes {
+  $type?: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
   account: string
   codes: string[]
-  [k: string]: unknown
 }
 
-export function isAccountCodes(
-  v: unknown,
-): v is AccountCodes & {
-  $type: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
-} {
-  return is$typed(v, id, 'accountCodes')
+const hashAccountCodes = 'accountCodes'
+
+export function isAccountCodes<V>(v: V) {
+  return is$typed(v, id, hashAccountCodes)
+}
+
+export function validateAccountCodes<V>(v: V) {
+  return validate<AccountCodes & V>(v, id, hashAccountCodes)
 }
 
-export function validateAccountCodes(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountCodes`,
-    v,
-  ) as ValidationResult<AccountCodes>
+export function isValidAccountCodes<V>(v: V) {
+  return isValid<AccountCodes>(v, id, hashAccountCodes)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
index 8d846520ae9..7a178dd09ef 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.createSession'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   identifier: string
   password: string
   authFactorToken?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -25,14 +30,13 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index 126255afd0d..e140ea3c638 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deactivateAccount'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** A recommendation to server as to how long they should hold onto the deactivated account before deleting. */
   deleteAfter?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/defs.ts b/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
index ed33e0b2a0f..d8aa65cfcd2 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
+  $type?: $Type<'com.atproto.server.defs', 'inviteCode'>
   code: string
   available: number
   disabled: boolean
@@ -16,39 +23,38 @@ export interface InviteCode {
   createdBy: string
   createdAt: string
   uses: InviteCodeUse[]
-  [k: string]: unknown
 }
 
-export function isInviteCode(
-  v: unknown,
-): v is InviteCode & { $type: $Type<'com.atproto.server.defs', 'inviteCode'> } {
-  return is$typed(v, id, 'inviteCode')
+const hashInviteCode = 'inviteCode'
+
+export function isInviteCode<V>(v: V) {
+  return is$typed(v, id, hashInviteCode)
+}
+
+export function validateInviteCode<V>(v: V) {
+  return validate<InviteCode & V>(v, id, hashInviteCode)
 }
 
-export function validateInviteCode(v: unknown) {
-  return lexicons.validate(
-    `${id}#inviteCode`,
-    v,
-  ) as ValidationResult<InviteCode>
+export function isValidInviteCode<V>(v: V) {
+  return isValid<InviteCode>(v, id, hashInviteCode)
 }
 
 export interface InviteCodeUse {
+  $type?: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
   usedBy: string
   usedAt: string
-  [k: string]: unknown
 }
 
-export function isInviteCodeUse(
-  v: unknown,
-): v is InviteCodeUse & {
-  $type: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
-} {
-  return is$typed(v, id, 'inviteCodeUse')
+const hashInviteCodeUse = 'inviteCodeUse'
+
+export function isInviteCodeUse<V>(v: V) {
+  return is$typed(v, id, hashInviteCodeUse)
+}
+
+export function validateInviteCodeUse<V>(v: V) {
+  return validate<InviteCodeUse & V>(v, id, hashInviteCodeUse)
 }
 
-export function validateInviteCodeUse(v: unknown) {
-  return lexicons.validate(
-    `${id}#inviteCodeUse`,
-    v,
-  ) as ValidationResult<InviteCodeUse>
+export function isValidInviteCodeUse<V>(v: V) {
+  return isValid<InviteCodeUse>(v, id, hashInviteCodeUse)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
index e082e24ae10..55eceb8a979 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deleteAccount'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export interface InputSchema {
   did: string
   password: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
index 90c6882cf87..3ef21a16c51 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.deleteSession'
 
 export interface QueryParams {}
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
index 736b7968877..e173e01549d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.describeServer'
 
 export interface QueryParams {}
@@ -24,7 +30,6 @@ export interface OutputSchema {
   links?: Links
   contact?: Contact
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -53,34 +58,40 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Links {
+  $type?: $Type<'com.atproto.server.describeServer', 'links'>
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(
-  v: unknown,
-): v is Links & { $type: $Type<'com.atproto.server.describeServer', 'links'> } {
-  return is$typed(v, id, 'links')
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
+}
+
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown) {
-  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
+export function isValidLinks<V>(v: V) {
+  return isValid<Links>(v, id, hashLinks)
 }
 
 export interface Contact {
+  $type?: $Type<'com.atproto.server.describeServer', 'contact'>
   email?: string
-  [k: string]: unknown
 }
 
-export function isContact(
-  v: unknown,
-): v is Contact & {
-  $type: $Type<'com.atproto.server.describeServer', 'contact'>
-} {
-  return is$typed(v, id, 'contact')
+const hashContact = 'contact'
+
+export function isContact<V>(v: V) {
+  return is$typed(v, id, hashContact)
+}
+
+export function validateContact<V>(v: V) {
+  return validate<Contact & V>(v, id, hashContact)
 }
 
-export function validateContact(v: unknown) {
-  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
+export function isValidContact<V>(v: V) {
+  return isValid<Contact>(v, id, hashContact)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 9668cf1f1e6..22962387ec0 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from './defs'
+import type * as ComAtprotoServerDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getAccountInviteCodes'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 54b3a3d4423..eb2c4131d7a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getServiceAuth'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   token: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
index e98c753d9d0..bccc27b5931 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.getSession'
 
 export interface QueryParams {}
@@ -20,11 +26,10 @@ export interface OutputSchema {
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index d868bbcb743..7a5c093fb08 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.listAppPasswords'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   passwords: AppPassword[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -46,23 +51,22 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
   name: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(
-  v: unknown,
-): v is AppPassword & {
-  $type: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
-} {
-  return is$typed(v, id, 'appPassword')
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
+}
+
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown) {
-  return lexicons.validate(
-    `${id}#appPassword`,
-    v,
-  ) as ValidationResult<AppPassword>
+export function isValidAppPassword<V>(v: V) {
+  return isValid<AppPassword>(v, id, hashAppPassword)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
index de1b570bf1a..ffbaaf3518f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.refreshSession'
 
 export interface QueryParams {}
@@ -19,11 +25,10 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** Hosting status of the account. If not specified, then assume 'active'. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 85131190ec9..016751b9480 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestAccountDelete'
 
 export interface QueryParams {}
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index fb58814aeb4..51e01eb4063 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestEmailConfirmation'
 
 export interface QueryParams {}
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 919e704328a..eb93689edfa 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestEmailUpdate'
 
 export interface QueryParams {}
@@ -16,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   tokenRequired: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index f9bcec52a1f..d0229992fe0 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.requestPasswordReset'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 64dfb8c8414..fd1cd466f54 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.reserveSigningKey'
 
 export interface QueryParams {}
@@ -15,13 +21,11 @@ export interface QueryParams {}
 export interface InputSchema {
   /** The DID to reserve a key for. */
   did?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   /** The public key for the reserved signing key, in did:key serialization. */
   signingKey: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
index d842e7e266d..c137ee2c256 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.resetPassword'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   token: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 92a8204560e..134624bbdc9 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.revokeAppPassword'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   name: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
index 4381078a0a6..f2346c39f1f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.server.updateEmail'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   emailAuthFactor?: boolean
   /** Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. */
   token?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
index d42913abd01..96b1f8120fa 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getBlob'
 
 export interface QueryParams {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
index a7dc7e73000..8a3dc3fef63 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getBlocks'
 
 export interface QueryParams {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 53d5b4bf39b..a2aba307807 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getCheckout'
 
 export interface QueryParams {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
index 1adceb80d8a..35bc0192941 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getHead'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index 290c02e15fa..fe6eb20d335 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getLatestCommit'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
index 8f03eb23951..793596f713b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRecord'
 
 export interface QueryParams {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
index 9cde9a4e01b..e30bfbe96e6 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -5,10 +5,16 @@ import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRepo'
 
 export interface QueryParams {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 414e67e7a67..6cebcb8cda8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.getRepoStatus'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export interface OutputSchema {
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
index 58fea9c1282..7ae1bb24487 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.listBlobs'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   cids: string[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
index 468977d448c..1980cda20c1 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.listRepos'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: Repo[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,6 +54,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Repo {
+  $type?: $Type<'com.atproto.sync.listRepos', 'repo'>
   did: string
   /** Current repo commit CID */
   head: string
@@ -56,15 +62,18 @@ export interface Repo {
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isRepo(
-  v: unknown,
-): v is Repo & { $type: $Type<'com.atproto.sync.listRepos', 'repo'> } {
-  return is$typed(v, id, 'repo')
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
+}
+
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
 }
 
-export function validateRepo(v: unknown) {
-  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
+export function isValidRepo<V>(v: V) {
+  return isValid<Repo>(v, id, hashRepo)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index 8fd62afe59e..fecb69994d2 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.notifyOfUpdate'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Hostname of the current service (usually a PDS) that is notifying of update. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index 5148b8c5f24..c2eeab14f4e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.requestCrawl'
 
 export interface QueryParams {}
@@ -15,7 +21,6 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Hostname of the current service (eg, PDS) that is requesting to be crawled. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 7c759389c2a..4d7a7444f92 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -3,11 +3,17 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.sync.subscribeRepos'
 
 export interface QueryParams {
@@ -16,14 +22,14 @@ export interface QueryParams {
 }
 
 export type OutputSchema =
-  | Commit
-  | Identity
-  | Account
-  | Handle
-  | Migrate
-  | Tombstone
-  | Info
-  | { $type: string; [k: string]: unknown }
+  | $Typed<Commit>
+  | $Typed<Identity>
+  | $Typed<Account>
+  | $Typed<Handle>
+  | $Typed<Migrate>
+  | $Typed<Tombstone>
+  | $Typed<Info>
+  | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor' | 'ConsumerTooSlow'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -38,6 +44,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. */
 export interface Commit {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'commit'>
   /** The stream sequence number of this message. */
   seq: number
   /** DEPRECATED -- unused */
@@ -60,43 +67,49 @@ export interface Commit {
   blobs: CID[]
   /** Timestamp of when this message was originally broadcast. */
   time: string
-  [k: string]: unknown
 }
 
-export function isCommit(
-  v: unknown,
-): v is Commit & { $type: $Type<'com.atproto.sync.subscribeRepos', 'commit'> } {
-  return is$typed(v, id, 'commit')
+const hashCommit = 'commit'
+
+export function isCommit<V>(v: V) {
+  return is$typed(v, id, hashCommit)
+}
+
+export function validateCommit<V>(v: V) {
+  return validate<Commit & V>(v, id, hashCommit)
 }
 
-export function validateCommit(v: unknown) {
-  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
+export function isValidCommit<V>(v: V) {
+  return isValid<Commit>(v, id, hashCommit)
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
   seq: number
   did: string
   time: string
   /** The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details. */
   handle?: string
-  [k: string]: unknown
 }
 
-export function isIdentity(
-  v: unknown,
-): v is Identity & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
-} {
-  return is$typed(v, id, 'identity')
+const hashIdentity = 'identity'
+
+export function isIdentity<V>(v: V) {
+  return is$typed(v, id, hashIdentity)
+}
+
+export function validateIdentity<V>(v: V) {
+  return validate<Identity & V>(v, id, hashIdentity)
 }
 
-export function validateIdentity(v: unknown) {
-  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
+export function isValidIdentity<V>(v: V) {
+  return isValid<Identity>(v, id, hashIdentity)
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
 export interface Account {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'account'>
   seq: number
   did: string
   time: string
@@ -104,112 +117,129 @@ export interface Account {
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
   status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isAccount(
-  v: unknown,
-): v is Account & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'account'>
-} {
-  return is$typed(v, id, 'account')
+const hashAccount = 'account'
+
+export function isAccount<V>(v: V) {
+  return is$typed(v, id, hashAccount)
+}
+
+export function validateAccount<V>(v: V) {
+  return validate<Account & V>(v, id, hashAccount)
 }
 
-export function validateAccount(v: unknown) {
-  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
+export function isValidAccount<V>(v: V) {
+  return isValid<Account>(v, id, hashAccount)
 }
 
 /** DEPRECATED -- Use #identity event instead */
 export interface Handle {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'handle'>
   seq: number
   did: string
   handle: string
   time: string
-  [k: string]: unknown
 }
 
-export function isHandle(
-  v: unknown,
-): v is Handle & { $type: $Type<'com.atproto.sync.subscribeRepos', 'handle'> } {
-  return is$typed(v, id, 'handle')
+const hashHandle = 'handle'
+
+export function isHandle<V>(v: V) {
+  return is$typed(v, id, hashHandle)
+}
+
+export function validateHandle<V>(v: V) {
+  return validate<Handle & V>(v, id, hashHandle)
 }
 
-export function validateHandle(v: unknown) {
-  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
+export function isValidHandle<V>(v: V) {
+  return isValid<Handle>(v, id, hashHandle)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Migrate {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
   seq: number
   did: string
   migrateTo: string | null
   time: string
-  [k: string]: unknown
 }
 
-export function isMigrate(
-  v: unknown,
-): v is Migrate & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
-} {
-  return is$typed(v, id, 'migrate')
+const hashMigrate = 'migrate'
+
+export function isMigrate<V>(v: V) {
+  return is$typed(v, id, hashMigrate)
+}
+
+export function validateMigrate<V>(v: V) {
+  return validate<Migrate & V>(v, id, hashMigrate)
 }
 
-export function validateMigrate(v: unknown) {
-  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
+export function isValidMigrate<V>(v: V) {
+  return isValid<Migrate>(v, id, hashMigrate)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Tombstone {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
   seq: number
   did: string
   time: string
-  [k: string]: unknown
 }
 
-export function isTombstone(
-  v: unknown,
-): v is Tombstone & {
-  $type: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
-} {
-  return is$typed(v, id, 'tombstone')
+const hashTombstone = 'tombstone'
+
+export function isTombstone<V>(v: V) {
+  return is$typed(v, id, hashTombstone)
+}
+
+export function validateTombstone<V>(v: V) {
+  return validate<Tombstone & V>(v, id, hashTombstone)
 }
 
-export function validateTombstone(v: unknown) {
-  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
+export function isValidTombstone<V>(v: V) {
+  return isValid<Tombstone>(v, id, hashTombstone)
 }
 
 export interface Info {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'info'>
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(
-  v: unknown,
-): v is Info & { $type: $Type<'com.atproto.sync.subscribeRepos', 'info'> } {
-  return is$typed(v, id, 'info')
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
+}
+
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown) {
-  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
+export function isValidInfo<V>(v: V) {
+  return isValid<Info>(v, id, hashInfo)
 }
 
 /** A repo operation, ie a mutation of a single record. */
 export interface RepoOp {
+  $type?: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'>
   action: 'create' | 'update' | 'delete' | (string & {})
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  [k: string]: unknown
 }
 
-export function isRepoOp(
-  v: unknown,
-): v is RepoOp & { $type: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'> } {
-  return is$typed(v, id, 'repoOp')
+const hashRepoOp = 'repoOp'
+
+export function isRepoOp<V>(v: V) {
+  return is$typed(v, id, hashRepoOp)
+}
+
+export function validateRepoOp<V>(v: V) {
+  return validate<RepoOp & V>(v, id, hashRepoOp)
 }
 
-export function validateRepoOp(v: unknown) {
-  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
+export function isValidRepoOp<V>(v: V) {
+  return isValid<RepoOp>(v, id, hashRepoOp)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index 374ab85c589..c7057a308f1 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -4,22 +4,25 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.addReservedHandle'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   handle: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 948068c5a6d..84ea4beae25 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.checkSignupQueue'
 
 export interface QueryParams {}
@@ -18,7 +24,6 @@ export interface OutputSchema {
   activated: boolean
   placeInQueue?: number
   estimatedTimeMs?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index c8741a1331b..887b31780a8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from '../label/defs'
+import type * as ComAtprotoLabelDefs from '../label/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.fetchLabels'
 
 export interface QueryParams {
@@ -20,7 +26,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index 556fe779d21..cf9f08e088e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'com.atproto.temp.requestPhoneVerification'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   phoneNumber: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
index b82931c64c7..4293c1388b3 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.createTemplate'
 
 export interface QueryParams {}
@@ -24,7 +30,6 @@ export interface InputSchema {
   lang?: string
   /** DID of the user who is creating the template. */
   createdBy?: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
index 3da6d45a98f..7cc4568c002 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
@@ -3,12 +3,19 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
+  $type?: $Type<'tools.ozone.communication.defs', 'templateView'>
   id: string
   /** Name of the template. */
   name: string
@@ -23,20 +30,18 @@ export interface TemplateView {
   lastUpdatedBy: string
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isTemplateView(
-  v: unknown,
-): v is TemplateView & {
-  $type: $Type<'tools.ozone.communication.defs', 'templateView'>
-} {
-  return is$typed(v, id, 'templateView')
+const hashTemplateView = 'templateView'
+
+export function isTemplateView<V>(v: V) {
+  return is$typed(v, id, hashTemplateView)
+}
+
+export function validateTemplateView<V>(v: V) {
+  return validate<TemplateView & V>(v, id, hashTemplateView)
 }
 
-export function validateTemplateView(v: unknown) {
-  return lexicons.validate(
-    `${id}#templateView`,
-    v,
-  ) as ValidationResult<TemplateView>
+export function isValidTemplateView<V>(v: V) {
+  return isValid<TemplateView>(v, id, hashTemplateView)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
index bcdc2b523b1..26d62a9f265 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.deleteTemplate'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   id: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
index 74260b5c495..8225c6610b4 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.listTemplates'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   communicationTemplates: ToolsOzoneCommunicationDefs.TemplateView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
index e7bcacb14ff..b81e6cc0b11 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.communication.updateTemplate'
 
 export interface QueryParams {}
@@ -27,7 +33,6 @@ export interface InputSchema {
   /** DID of the user who is updating the template. */
   updatedBy?: string
   disabled?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
index 05d86bc8529..b835c20d110 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -3,126 +3,128 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
-import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
-import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
+import type * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.defs'
 
 export interface ModEventView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventView'>
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ChatBskyConvoDefs.MessageRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ChatBskyConvoDefs.MessageRef>
+    | { $type: string }
   subjectBlobCids: string[]
   createdBy: string
   createdAt: string
   creatorHandle?: string
   subjectHandle?: string
-  [k: string]: unknown
 }
 
-export function isModEventView(
-  v: unknown,
-): v is ModEventView & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventView'>
-} {
-  return is$typed(v, id, 'modEventView')
+const hashModEventView = 'modEventView'
+
+export function isModEventView<V>(v: V) {
+  return is$typed(v, id, hashModEventView)
 }
 
-export function validateModEventView(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventView`,
-    v,
-  ) as ValidationResult<ModEventView>
+export function validateModEventView<V>(v: V) {
+  return validate<ModEventView & V>(v, id, hashModEventView)
+}
+
+export function isValidModEventView<V>(v: V) {
+  return isValid<ModEventView>(v, id, hashModEventView)
 }
 
 export interface ModEventViewDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventViewDetail'>
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | { $type: string }
   subject:
-    | RepoView
-    | RepoViewNotFound
-    | RecordView
-    | RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<RepoView>
+    | $Typed<RepoViewNotFound>
+    | $Typed<RecordView>
+    | $Typed<RecordViewNotFound>
+    | { $type: string }
   subjectBlobs: BlobView[]
   createdBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
-export function isModEventViewDetail(
-  v: unknown,
-): v is ModEventViewDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventViewDetail'>
-} {
-  return is$typed(v, id, 'modEventViewDetail')
+const hashModEventViewDetail = 'modEventViewDetail'
+
+export function isModEventViewDetail<V>(v: V) {
+  return is$typed(v, id, hashModEventViewDetail)
 }
 
-export function validateModEventViewDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventViewDetail`,
-    v,
-  ) as ValidationResult<ModEventViewDetail>
+export function validateModEventViewDetail<V>(v: V) {
+  return validate<ModEventViewDetail & V>(v, id, hashModEventViewDetail)
+}
+
+export function isValidModEventViewDetail<V>(v: V) {
+  return isValid<ModEventViewDetail>(v, id, hashModEventViewDetail)
 }
 
 export interface SubjectStatusView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'subjectStatusView'>
   id: number
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  hosting?:
-    | AccountHosting
-    | RecordHosting
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
+  hosting?: $Typed<AccountHosting> | $Typed<RecordHosting> | { $type: string }
   subjectBlobCids?: string[]
   subjectRepoHandle?: string
   /** Timestamp referencing when the last update was made to the moderation status of the subject */
@@ -144,22 +146,20 @@ export interface SubjectStatusView {
   appealed?: boolean
   suspendUntil?: string
   tags?: string[]
-  [k: string]: unknown
 }
 
-export function isSubjectStatusView(
-  v: unknown,
-): v is SubjectStatusView & {
-  $type: $Type<'tools.ozone.moderation.defs', 'subjectStatusView'>
-} {
-  return is$typed(v, id, 'subjectStatusView')
+const hashSubjectStatusView = 'subjectStatusView'
+
+export function isSubjectStatusView<V>(v: V) {
+  return is$typed(v, id, hashSubjectStatusView)
 }
 
-export function validateSubjectStatusView(v: unknown) {
-  return lexicons.validate(
-    `${id}#subjectStatusView`,
-    v,
-  ) as ValidationResult<SubjectStatusView>
+export function validateSubjectStatusView<V>(v: V) {
+  return validate<SubjectStatusView & V>(v, id, hashSubjectStatusView)
+}
+
+export function isValidSubjectStatusView<V>(v: V) {
+  return isValid<SubjectStatusView>(v, id, hashSubjectStatusView)
 }
 
 export type SubjectReviewState =
@@ -180,350 +180,340 @@ export const REVIEWNONE = `${id}#reviewNone`
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventTakedown'>
   comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
   acknowledgeAccountSubjects?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventTakedown(
-  v: unknown,
-): v is ModEventTakedown & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventTakedown'>
-} {
-  return is$typed(v, id, 'modEventTakedown')
+const hashModEventTakedown = 'modEventTakedown'
+
+export function isModEventTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventTakedown)
 }
 
-export function validateModEventTakedown(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventTakedown`,
-    v,
-  ) as ValidationResult<ModEventTakedown>
+export function validateModEventTakedown<V>(v: V) {
+  return validate<ModEventTakedown & V>(v, id, hashModEventTakedown)
+}
+
+export function isValidModEventTakedown<V>(v: V) {
+  return isValid<ModEventTakedown>(v, id, hashModEventTakedown)
 }
 
 /** Revert take down action on a subject */
 export interface ModEventReverseTakedown {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventReverseTakedown'>
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventReverseTakedown(
-  v: unknown,
-): v is ModEventReverseTakedown & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventReverseTakedown'>
-} {
-  return is$typed(v, id, 'modEventReverseTakedown')
+const hashModEventReverseTakedown = 'modEventReverseTakedown'
+
+export function isModEventReverseTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventReverseTakedown)
 }
 
-export function validateModEventReverseTakedown(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventReverseTakedown`,
+export function validateModEventReverseTakedown<V>(v: V) {
+  return validate<ModEventReverseTakedown & V>(
     v,
-  ) as ValidationResult<ModEventReverseTakedown>
+    id,
+    hashModEventReverseTakedown,
+  )
+}
+
+export function isValidModEventReverseTakedown<V>(v: V) {
+  return isValid<ModEventReverseTakedown>(v, id, hashModEventReverseTakedown)
 }
 
 /** Resolve appeal on a subject */
 export interface ModEventResolveAppeal {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventResolveAppeal'>
   /** Describe resolution. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventResolveAppeal(
-  v: unknown,
-): v is ModEventResolveAppeal & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventResolveAppeal'>
-} {
-  return is$typed(v, id, 'modEventResolveAppeal')
+const hashModEventResolveAppeal = 'modEventResolveAppeal'
+
+export function isModEventResolveAppeal<V>(v: V) {
+  return is$typed(v, id, hashModEventResolveAppeal)
 }
 
-export function validateModEventResolveAppeal(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventResolveAppeal`,
-    v,
-  ) as ValidationResult<ModEventResolveAppeal>
+export function validateModEventResolveAppeal<V>(v: V) {
+  return validate<ModEventResolveAppeal & V>(v, id, hashModEventResolveAppeal)
+}
+
+export function isValidModEventResolveAppeal<V>(v: V) {
+  return isValid<ModEventResolveAppeal>(v, id, hashModEventResolveAppeal)
 }
 
 /** Add a comment to a subject */
 export interface ModEventComment {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventComment'>
   comment: string
   /** Make the comment persistent on the subject */
   sticky?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventComment(
-  v: unknown,
-): v is ModEventComment & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventComment'>
-} {
-  return is$typed(v, id, 'modEventComment')
+const hashModEventComment = 'modEventComment'
+
+export function isModEventComment<V>(v: V) {
+  return is$typed(v, id, hashModEventComment)
 }
 
-export function validateModEventComment(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventComment`,
-    v,
-  ) as ValidationResult<ModEventComment>
+export function validateModEventComment<V>(v: V) {
+  return validate<ModEventComment & V>(v, id, hashModEventComment)
+}
+
+export function isValidModEventComment<V>(v: V) {
+  return isValid<ModEventComment>(v, id, hashModEventComment)
 }
 
 /** Report a subject */
 export interface ModEventReport {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventReport'>
   comment?: string
   /** Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject. */
   isReporterMuted?: boolean
   reportType: ComAtprotoModerationDefs.ReasonType
-  [k: string]: unknown
 }
 
-export function isModEventReport(
-  v: unknown,
-): v is ModEventReport & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventReport'>
-} {
-  return is$typed(v, id, 'modEventReport')
+const hashModEventReport = 'modEventReport'
+
+export function isModEventReport<V>(v: V) {
+  return is$typed(v, id, hashModEventReport)
 }
 
-export function validateModEventReport(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventReport`,
-    v,
-  ) as ValidationResult<ModEventReport>
+export function validateModEventReport<V>(v: V) {
+  return validate<ModEventReport & V>(v, id, hashModEventReport)
+}
+
+export function isValidModEventReport<V>(v: V) {
+  return isValid<ModEventReport>(v, id, hashModEventReport)
 }
 
 /** Apply/Negate labels on a subject */
 export interface ModEventLabel {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventLabel'>
   comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
-  [k: string]: unknown
 }
 
-export function isModEventLabel(
-  v: unknown,
-): v is ModEventLabel & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventLabel'>
-} {
-  return is$typed(v, id, 'modEventLabel')
+const hashModEventLabel = 'modEventLabel'
+
+export function isModEventLabel<V>(v: V) {
+  return is$typed(v, id, hashModEventLabel)
 }
 
-export function validateModEventLabel(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventLabel`,
-    v,
-  ) as ValidationResult<ModEventLabel>
+export function validateModEventLabel<V>(v: V) {
+  return validate<ModEventLabel & V>(v, id, hashModEventLabel)
+}
+
+export function isValidModEventLabel<V>(v: V) {
+  return isValid<ModEventLabel>(v, id, hashModEventLabel)
 }
 
 export interface ModEventAcknowledge {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventAcknowledge'>
   comment?: string
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
   acknowledgeAccountSubjects?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventAcknowledge(
-  v: unknown,
-): v is ModEventAcknowledge & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventAcknowledge'>
-} {
-  return is$typed(v, id, 'modEventAcknowledge')
+const hashModEventAcknowledge = 'modEventAcknowledge'
+
+export function isModEventAcknowledge<V>(v: V) {
+  return is$typed(v, id, hashModEventAcknowledge)
 }
 
-export function validateModEventAcknowledge(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventAcknowledge`,
-    v,
-  ) as ValidationResult<ModEventAcknowledge>
+export function validateModEventAcknowledge<V>(v: V) {
+  return validate<ModEventAcknowledge & V>(v, id, hashModEventAcknowledge)
+}
+
+export function isValidModEventAcknowledge<V>(v: V) {
+  return isValid<ModEventAcknowledge>(v, id, hashModEventAcknowledge)
 }
 
 export interface ModEventEscalate {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventEscalate'>
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEscalate(
-  v: unknown,
-): v is ModEventEscalate & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventEscalate'>
-} {
-  return is$typed(v, id, 'modEventEscalate')
+const hashModEventEscalate = 'modEventEscalate'
+
+export function isModEventEscalate<V>(v: V) {
+  return is$typed(v, id, hashModEventEscalate)
 }
 
-export function validateModEventEscalate(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventEscalate`,
-    v,
-  ) as ValidationResult<ModEventEscalate>
+export function validateModEventEscalate<V>(v: V) {
+  return validate<ModEventEscalate & V>(v, id, hashModEventEscalate)
+}
+
+export function isValidModEventEscalate<V>(v: V) {
+  return isValid<ModEventEscalate>(v, id, hashModEventEscalate)
 }
 
 /** Mute incoming reports on a subject */
 export interface ModEventMute {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventMute'>
   comment?: string
   /** Indicates how long the subject should remain muted. */
   durationInHours: number
-  [k: string]: unknown
 }
 
-export function isModEventMute(
-  v: unknown,
-): v is ModEventMute & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventMute'>
-} {
-  return is$typed(v, id, 'modEventMute')
+const hashModEventMute = 'modEventMute'
+
+export function isModEventMute<V>(v: V) {
+  return is$typed(v, id, hashModEventMute)
 }
 
-export function validateModEventMute(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventMute`,
-    v,
-  ) as ValidationResult<ModEventMute>
+export function validateModEventMute<V>(v: V) {
+  return validate<ModEventMute & V>(v, id, hashModEventMute)
+}
+
+export function isValidModEventMute<V>(v: V) {
+  return isValid<ModEventMute>(v, id, hashModEventMute)
 }
 
 /** Unmute action on a subject */
 export interface ModEventUnmute {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventUnmute'>
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmute(
-  v: unknown,
-): v is ModEventUnmute & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmute'>
-} {
-  return is$typed(v, id, 'modEventUnmute')
+const hashModEventUnmute = 'modEventUnmute'
+
+export function isModEventUnmute<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmute)
 }
 
-export function validateModEventUnmute(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventUnmute`,
-    v,
-  ) as ValidationResult<ModEventUnmute>
+export function validateModEventUnmute<V>(v: V) {
+  return validate<ModEventUnmute & V>(v, id, hashModEventUnmute)
+}
+
+export function isValidModEventUnmute<V>(v: V) {
+  return isValid<ModEventUnmute>(v, id, hashModEventUnmute)
 }
 
 /** Mute incoming reports from an account */
 export interface ModEventMuteReporter {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventMuteReporter'>
   comment?: string
   /** Indicates how long the account should remain muted. Falsy value here means a permanent mute. */
   durationInHours?: number
-  [k: string]: unknown
 }
 
-export function isModEventMuteReporter(
-  v: unknown,
-): v is ModEventMuteReporter & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventMuteReporter'>
-} {
-  return is$typed(v, id, 'modEventMuteReporter')
+const hashModEventMuteReporter = 'modEventMuteReporter'
+
+export function isModEventMuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventMuteReporter)
 }
 
-export function validateModEventMuteReporter(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventMuteReporter`,
-    v,
-  ) as ValidationResult<ModEventMuteReporter>
+export function validateModEventMuteReporter<V>(v: V) {
+  return validate<ModEventMuteReporter & V>(v, id, hashModEventMuteReporter)
+}
+
+export function isValidModEventMuteReporter<V>(v: V) {
+  return isValid<ModEventMuteReporter>(v, id, hashModEventMuteReporter)
 }
 
 /** Unmute incoming reports from an account */
 export interface ModEventUnmuteReporter {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventUnmuteReporter'>
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmuteReporter(
-  v: unknown,
-): v is ModEventUnmuteReporter & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmuteReporter'>
-} {
-  return is$typed(v, id, 'modEventUnmuteReporter')
+const hashModEventUnmuteReporter = 'modEventUnmuteReporter'
+
+export function isModEventUnmuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmuteReporter)
 }
 
-export function validateModEventUnmuteReporter(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventUnmuteReporter`,
-    v,
-  ) as ValidationResult<ModEventUnmuteReporter>
+export function validateModEventUnmuteReporter<V>(v: V) {
+  return validate<ModEventUnmuteReporter & V>(v, id, hashModEventUnmuteReporter)
+}
+
+export function isValidModEventUnmuteReporter<V>(v: V) {
+  return isValid<ModEventUnmuteReporter>(v, id, hashModEventUnmuteReporter)
 }
 
 /** Keep a log of outgoing email to a user */
 export interface ModEventEmail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventEmail'>
   /** The subject line of the email sent to the user. */
   subjectLine: string
   /** The content of the email sent to the user. */
   content?: string
   /** Additional comment about the outgoing comm. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEmail(
-  v: unknown,
-): v is ModEventEmail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventEmail'>
-} {
-  return is$typed(v, id, 'modEventEmail')
+const hashModEventEmail = 'modEventEmail'
+
+export function isModEventEmail<V>(v: V) {
+  return is$typed(v, id, hashModEventEmail)
 }
 
-export function validateModEventEmail(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventEmail`,
-    v,
-  ) as ValidationResult<ModEventEmail>
+export function validateModEventEmail<V>(v: V) {
+  return validate<ModEventEmail & V>(v, id, hashModEventEmail)
+}
+
+export function isValidModEventEmail<V>(v: V) {
+  return isValid<ModEventEmail>(v, id, hashModEventEmail)
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
 export interface ModEventDivert {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventDivert'>
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventDivert(
-  v: unknown,
-): v is ModEventDivert & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventDivert'>
-} {
-  return is$typed(v, id, 'modEventDivert')
+const hashModEventDivert = 'modEventDivert'
+
+export function isModEventDivert<V>(v: V) {
+  return is$typed(v, id, hashModEventDivert)
 }
 
-export function validateModEventDivert(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventDivert`,
-    v,
-  ) as ValidationResult<ModEventDivert>
+export function validateModEventDivert<V>(v: V) {
+  return validate<ModEventDivert & V>(v, id, hashModEventDivert)
+}
+
+export function isValidModEventDivert<V>(v: V) {
+  return isValid<ModEventDivert>(v, id, hashModEventDivert)
 }
 
 /** Add/Remove a tag on a subject */
 export interface ModEventTag {
+  $type?: $Type<'tools.ozone.moderation.defs', 'modEventTag'>
   /** Tags to be added to the subject. If already exists, won't be duplicated. */
   add: string[]
   /** Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated. */
   remove: string[]
   /** Additional comment about added/removed tags. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventTag(
-  v: unknown,
-): v is ModEventTag & {
-  $type: $Type<'tools.ozone.moderation.defs', 'modEventTag'>
-} {
-  return is$typed(v, id, 'modEventTag')
+const hashModEventTag = 'modEventTag'
+
+export function isModEventTag<V>(v: V) {
+  return is$typed(v, id, hashModEventTag)
 }
 
-export function validateModEventTag(v: unknown) {
-  return lexicons.validate(
-    `${id}#modEventTag`,
-    v,
-  ) as ValidationResult<ModEventTag>
+export function validateModEventTag<V>(v: V) {
+  return validate<ModEventTag & V>(v, id, hashModEventTag)
+}
+
+export function isValidModEventTag<V>(v: V) {
+  return isValid<ModEventTag>(v, id, hashModEventTag)
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface AccountEvent {
+  $type?: $Type<'tools.ozone.moderation.defs', 'accountEvent'>
   comment?: string
   /** Indicates that the account has a repository which can be fetched from the host that emitted this event. */
   active: boolean
@@ -536,78 +526,75 @@ export interface AccountEvent {
     | 'tombstoned'
     | (string & {})
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isAccountEvent(
-  v: unknown,
-): v is AccountEvent & {
-  $type: $Type<'tools.ozone.moderation.defs', 'accountEvent'>
-} {
-  return is$typed(v, id, 'accountEvent')
+const hashAccountEvent = 'accountEvent'
+
+export function isAccountEvent<V>(v: V) {
+  return is$typed(v, id, hashAccountEvent)
 }
 
-export function validateAccountEvent(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountEvent`,
-    v,
-  ) as ValidationResult<AccountEvent>
+export function validateAccountEvent<V>(v: V) {
+  return validate<AccountEvent & V>(v, id, hashAccountEvent)
+}
+
+export function isValidAccountEvent<V>(v: V) {
+  return isValid<AccountEvent>(v, id, hashAccountEvent)
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface IdentityEvent {
+  $type?: $Type<'tools.ozone.moderation.defs', 'identityEvent'>
   comment?: string
   handle?: string
   pdsHost?: string
   tombstone?: boolean
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isIdentityEvent(
-  v: unknown,
-): v is IdentityEvent & {
-  $type: $Type<'tools.ozone.moderation.defs', 'identityEvent'>
-} {
-  return is$typed(v, id, 'identityEvent')
+const hashIdentityEvent = 'identityEvent'
+
+export function isIdentityEvent<V>(v: V) {
+  return is$typed(v, id, hashIdentityEvent)
 }
 
-export function validateIdentityEvent(v: unknown) {
-  return lexicons.validate(
-    `${id}#identityEvent`,
-    v,
-  ) as ValidationResult<IdentityEvent>
+export function validateIdentityEvent<V>(v: V) {
+  return validate<IdentityEvent & V>(v, id, hashIdentityEvent)
+}
+
+export function isValidIdentityEvent<V>(v: V) {
+  return isValid<IdentityEvent>(v, id, hashIdentityEvent)
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface RecordEvent {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordEvent'>
   comment?: string
   op: 'create' | 'update' | 'delete' | (string & {})
   cid?: string
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isRecordEvent(
-  v: unknown,
-): v is RecordEvent & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordEvent'>
-} {
-  return is$typed(v, id, 'recordEvent')
+const hashRecordEvent = 'recordEvent'
+
+export function isRecordEvent<V>(v: V) {
+  return is$typed(v, id, hashRecordEvent)
 }
 
-export function validateRecordEvent(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordEvent`,
-    v,
-  ) as ValidationResult<RecordEvent>
+export function validateRecordEvent<V>(v: V) {
+  return validate<RecordEvent & V>(v, id, hashRecordEvent)
+}
+
+export function isValidRecordEvent<V>(v: V) {
+  return isValid<RecordEvent>(v, id, hashRecordEvent)
 }
 
 export interface RepoView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'repoView'>
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: Moderation
   invitedBy?: ComAtprotoServerDefs.InviteCode
@@ -615,24 +602,28 @@ export interface RepoView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoView(
-  v: unknown,
-): v is RepoView & { $type: $Type<'tools.ozone.moderation.defs', 'repoView'> } {
-  return is$typed(v, id, 'repoView')
+const hashRepoView = 'repoView'
+
+export function isRepoView<V>(v: V) {
+  return is$typed(v, id, hashRepoView)
+}
+
+export function validateRepoView<V>(v: V) {
+  return validate<RepoView & V>(v, id, hashRepoView)
 }
 
-export function validateRepoView(v: unknown) {
-  return lexicons.validate(`${id}#repoView`, v) as ValidationResult<RepoView>
+export function isValidRepoView<V>(v: V) {
+  return isValid<RepoView>(v, id, hashRepoView)
 }
 
 export interface RepoViewDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'repoViewDetail'>
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: ModerationDetail
   labels?: ComAtprotoLabelDefs.Label[]
@@ -643,224 +634,216 @@ export interface RepoViewDetail {
   emailConfirmedAt?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoViewDetail(
-  v: unknown,
-): v is RepoViewDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'repoViewDetail'>
-} {
-  return is$typed(v, id, 'repoViewDetail')
+const hashRepoViewDetail = 'repoViewDetail'
+
+export function isRepoViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRepoViewDetail)
 }
 
-export function validateRepoViewDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#repoViewDetail`,
-    v,
-  ) as ValidationResult<RepoViewDetail>
+export function validateRepoViewDetail<V>(v: V) {
+  return validate<RepoViewDetail & V>(v, id, hashRepoViewDetail)
+}
+
+export function isValidRepoViewDetail<V>(v: V) {
+  return isValid<RepoViewDetail>(v, id, hashRepoViewDetail)
 }
 
 export interface RepoViewNotFound {
+  $type?: $Type<'tools.ozone.moderation.defs', 'repoViewNotFound'>
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoViewNotFound(
-  v: unknown,
-): v is RepoViewNotFound & {
-  $type: $Type<'tools.ozone.moderation.defs', 'repoViewNotFound'>
-} {
-  return is$typed(v, id, 'repoViewNotFound')
+const hashRepoViewNotFound = 'repoViewNotFound'
+
+export function isRepoViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRepoViewNotFound)
 }
 
-export function validateRepoViewNotFound(v: unknown) {
-  return lexicons.validate(
-    `${id}#repoViewNotFound`,
-    v,
-  ) as ValidationResult<RepoViewNotFound>
+export function validateRepoViewNotFound<V>(v: V) {
+  return validate<RepoViewNotFound & V>(v, id, hashRepoViewNotFound)
+}
+
+export function isValidRepoViewNotFound<V>(v: V) {
+  return isValid<RepoViewNotFound>(v, id, hashRepoViewNotFound)
 }
 
 export interface RecordView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordView'>
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobCids: string[]
   indexedAt: string
   moderation: Moderation
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordView(
-  v: unknown,
-): v is RecordView & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordView'>
-} {
-  return is$typed(v, id, 'recordView')
+const hashRecordView = 'recordView'
+
+export function isRecordView<V>(v: V) {
+  return is$typed(v, id, hashRecordView)
 }
 
-export function validateRecordView(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordView`,
-    v,
-  ) as ValidationResult<RecordView>
+export function validateRecordView<V>(v: V) {
+  return validate<RecordView & V>(v, id, hashRecordView)
+}
+
+export function isValidRecordView<V>(v: V) {
+  return isValid<RecordView>(v, id, hashRecordView)
 }
 
 export interface RecordViewDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordViewDetail'>
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobs: BlobView[]
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
   moderation: ModerationDetail
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordViewDetail(
-  v: unknown,
-): v is RecordViewDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordViewDetail'>
-} {
-  return is$typed(v, id, 'recordViewDetail')
+const hashRecordViewDetail = 'recordViewDetail'
+
+export function isRecordViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRecordViewDetail)
 }
 
-export function validateRecordViewDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordViewDetail`,
-    v,
-  ) as ValidationResult<RecordViewDetail>
+export function validateRecordViewDetail<V>(v: V) {
+  return validate<RecordViewDetail & V>(v, id, hashRecordViewDetail)
+}
+
+export function isValidRecordViewDetail<V>(v: V) {
+  return isValid<RecordViewDetail>(v, id, hashRecordViewDetail)
 }
 
 export interface RecordViewNotFound {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordViewNotFound'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isRecordViewNotFound(
-  v: unknown,
-): v is RecordViewNotFound & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordViewNotFound'>
-} {
-  return is$typed(v, id, 'recordViewNotFound')
+const hashRecordViewNotFound = 'recordViewNotFound'
+
+export function isRecordViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRecordViewNotFound)
 }
 
-export function validateRecordViewNotFound(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordViewNotFound`,
-    v,
-  ) as ValidationResult<RecordViewNotFound>
+export function validateRecordViewNotFound<V>(v: V) {
+  return validate<RecordViewNotFound & V>(v, id, hashRecordViewNotFound)
+}
+
+export function isValidRecordViewNotFound<V>(v: V) {
+  return isValid<RecordViewNotFound>(v, id, hashRecordViewNotFound)
 }
 
 export interface Moderation {
+  $type?: $Type<'tools.ozone.moderation.defs', 'moderation'>
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModeration(
-  v: unknown,
-): v is Moderation & {
-  $type: $Type<'tools.ozone.moderation.defs', 'moderation'>
-} {
-  return is$typed(v, id, 'moderation')
+const hashModeration = 'moderation'
+
+export function isModeration<V>(v: V) {
+  return is$typed(v, id, hashModeration)
 }
 
-export function validateModeration(v: unknown) {
-  return lexicons.validate(
-    `${id}#moderation`,
-    v,
-  ) as ValidationResult<Moderation>
+export function validateModeration<V>(v: V) {
+  return validate<Moderation & V>(v, id, hashModeration)
+}
+
+export function isValidModeration<V>(v: V) {
+  return isValid<Moderation>(v, id, hashModeration)
 }
 
 export interface ModerationDetail {
+  $type?: $Type<'tools.ozone.moderation.defs', 'moderationDetail'>
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModerationDetail(
-  v: unknown,
-): v is ModerationDetail & {
-  $type: $Type<'tools.ozone.moderation.defs', 'moderationDetail'>
-} {
-  return is$typed(v, id, 'moderationDetail')
+const hashModerationDetail = 'moderationDetail'
+
+export function isModerationDetail<V>(v: V) {
+  return is$typed(v, id, hashModerationDetail)
 }
 
-export function validateModerationDetail(v: unknown) {
-  return lexicons.validate(
-    `${id}#moderationDetail`,
-    v,
-  ) as ValidationResult<ModerationDetail>
+export function validateModerationDetail<V>(v: V) {
+  return validate<ModerationDetail & V>(v, id, hashModerationDetail)
+}
+
+export function isValidModerationDetail<V>(v: V) {
+  return isValid<ModerationDetail>(v, id, hashModerationDetail)
 }
 
 export interface BlobView {
+  $type?: $Type<'tools.ozone.moderation.defs', 'blobView'>
   cid: string
   mimeType: string
   size: number
   createdAt: string
-  details?:
-    | ImageDetails
-    | VideoDetails
-    | { $type: string; [k: string]: unknown }
+  details?: $Typed<ImageDetails> | $Typed<VideoDetails> | { $type: string }
   moderation?: Moderation
-  [k: string]: unknown
 }
 
-export function isBlobView(
-  v: unknown,
-): v is BlobView & { $type: $Type<'tools.ozone.moderation.defs', 'blobView'> } {
-  return is$typed(v, id, 'blobView')
+const hashBlobView = 'blobView'
+
+export function isBlobView<V>(v: V) {
+  return is$typed(v, id, hashBlobView)
+}
+
+export function validateBlobView<V>(v: V) {
+  return validate<BlobView & V>(v, id, hashBlobView)
 }
 
-export function validateBlobView(v: unknown) {
-  return lexicons.validate(`${id}#blobView`, v) as ValidationResult<BlobView>
+export function isValidBlobView<V>(v: V) {
+  return isValid<BlobView>(v, id, hashBlobView)
 }
 
 export interface ImageDetails {
+  $type?: $Type<'tools.ozone.moderation.defs', 'imageDetails'>
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isImageDetails(
-  v: unknown,
-): v is ImageDetails & {
-  $type: $Type<'tools.ozone.moderation.defs', 'imageDetails'>
-} {
-  return is$typed(v, id, 'imageDetails')
+const hashImageDetails = 'imageDetails'
+
+export function isImageDetails<V>(v: V) {
+  return is$typed(v, id, hashImageDetails)
 }
 
-export function validateImageDetails(v: unknown) {
-  return lexicons.validate(
-    `${id}#imageDetails`,
-    v,
-  ) as ValidationResult<ImageDetails>
+export function validateImageDetails<V>(v: V) {
+  return validate<ImageDetails & V>(v, id, hashImageDetails)
+}
+
+export function isValidImageDetails<V>(v: V) {
+  return isValid<ImageDetails>(v, id, hashImageDetails)
 }
 
 export interface VideoDetails {
+  $type?: $Type<'tools.ozone.moderation.defs', 'videoDetails'>
   width: number
   height: number
   length: number
-  [k: string]: unknown
 }
 
-export function isVideoDetails(
-  v: unknown,
-): v is VideoDetails & {
-  $type: $Type<'tools.ozone.moderation.defs', 'videoDetails'>
-} {
-  return is$typed(v, id, 'videoDetails')
+const hashVideoDetails = 'videoDetails'
+
+export function isVideoDetails<V>(v: V) {
+  return is$typed(v, id, hashVideoDetails)
 }
 
-export function validateVideoDetails(v: unknown) {
-  return lexicons.validate(
-    `${id}#videoDetails`,
-    v,
-  ) as ValidationResult<VideoDetails>
+export function validateVideoDetails<V>(v: V) {
+  return validate<VideoDetails & V>(v, id, hashVideoDetails)
+}
+
+export function isValidVideoDetails<V>(v: V) {
+  return isValid<VideoDetails>(v, id, hashVideoDetails)
 }
 
 export interface AccountHosting {
+  $type?: $Type<'tools.ozone.moderation.defs', 'accountHosting'>
   status:
     | 'takendown'
     | 'suspended'
@@ -873,43 +856,40 @@ export interface AccountHosting {
   deletedAt?: string
   deactivatedAt?: string
   reactivatedAt?: string
-  [k: string]: unknown
 }
 
-export function isAccountHosting(
-  v: unknown,
-): v is AccountHosting & {
-  $type: $Type<'tools.ozone.moderation.defs', 'accountHosting'>
-} {
-  return is$typed(v, id, 'accountHosting')
+const hashAccountHosting = 'accountHosting'
+
+export function isAccountHosting<V>(v: V) {
+  return is$typed(v, id, hashAccountHosting)
 }
 
-export function validateAccountHosting(v: unknown) {
-  return lexicons.validate(
-    `${id}#accountHosting`,
-    v,
-  ) as ValidationResult<AccountHosting>
+export function validateAccountHosting<V>(v: V) {
+  return validate<AccountHosting & V>(v, id, hashAccountHosting)
+}
+
+export function isValidAccountHosting<V>(v: V) {
+  return isValid<AccountHosting>(v, id, hashAccountHosting)
 }
 
 export interface RecordHosting {
+  $type?: $Type<'tools.ozone.moderation.defs', 'recordHosting'>
   status: 'deleted' | 'unknown' | (string & {})
   updatedAt?: string
   createdAt?: string
   deletedAt?: string
-  [k: string]: unknown
 }
 
-export function isRecordHosting(
-  v: unknown,
-): v is RecordHosting & {
-  $type: $Type<'tools.ozone.moderation.defs', 'recordHosting'>
-} {
-  return is$typed(v, id, 'recordHosting')
+const hashRecordHosting = 'recordHosting'
+
+export function isRecordHosting<V>(v: V) {
+  return is$typed(v, id, hashRecordHosting)
 }
 
-export function validateRecordHosting(v: unknown) {
-  return lexicons.validate(
-    `${id}#recordHosting`,
-    v,
-  ) as ValidationResult<RecordHosting>
+export function validateRecordHosting<V>(v: V) {
+  return validate<RecordHosting & V>(v, id, hashRecordHosting)
+}
+
+export function isValidRecordHosting<V>(v: V) {
+  return isValid<RecordHosting>(v, id, hashRecordHosting)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index 80a4fe08d09..e701314e22c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -4,44 +4,49 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as ToolsOzoneModerationDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.emitEvent'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   event:
-    | ToolsOzoneModerationDefs.ModEventTakedown
-    | ToolsOzoneModerationDefs.ModEventAcknowledge
-    | ToolsOzoneModerationDefs.ModEventEscalate
-    | ToolsOzoneModerationDefs.ModEventComment
-    | ToolsOzoneModerationDefs.ModEventLabel
-    | ToolsOzoneModerationDefs.ModEventReport
-    | ToolsOzoneModerationDefs.ModEventMute
-    | ToolsOzoneModerationDefs.ModEventUnmute
-    | ToolsOzoneModerationDefs.ModEventMuteReporter
-    | ToolsOzoneModerationDefs.ModEventUnmuteReporter
-    | ToolsOzoneModerationDefs.ModEventReverseTakedown
-    | ToolsOzoneModerationDefs.ModEventResolveAppeal
-    | ToolsOzoneModerationDefs.ModEventEmail
-    | ToolsOzoneModerationDefs.ModEventTag
-    | ToolsOzoneModerationDefs.AccountEvent
-    | ToolsOzoneModerationDefs.IdentityEvent
-    | ToolsOzoneModerationDefs.RecordEvent
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.ModEventTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventAcknowledge>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEscalate>
+    | $Typed<ToolsOzoneModerationDefs.ModEventComment>
+    | $Typed<ToolsOzoneModerationDefs.ModEventLabel>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReport>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEmail>
+    | $Typed<ToolsOzoneModerationDefs.ModEventTag>
+    | $Typed<ToolsOzoneModerationDefs.AccountEvent>
+    | $Typed<ToolsOzoneModerationDefs.IdentityEvent>
+    | $Typed<ToolsOzoneModerationDefs.RecordEvent>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   subjectBlobCids?: string[]
   createdBy: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneModerationDefs.ModEventView
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
index 1a84e25919e..77ed5b1f7fa 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getEvent'
 
 export interface QueryParams {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
index 6d8e603b879..0939ba10304 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRecord'
 
 export interface QueryParams {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
index 73a3199fa1f..89a39ea5a1b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRecords'
 
 export interface QueryParams {
@@ -19,11 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   records: (
-    | ToolsOzoneModerationDefs.RecordViewDetail
-    | ToolsOzoneModerationDefs.RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RecordViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RecordViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
index 84845fe0772..427ef422085 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRepo'
 
 export interface QueryParams {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
index 55245c421d4..3cf8c43c454 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.getRepos'
 
 export interface QueryParams {
@@ -19,11 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   repos: (
-    | ToolsOzoneModerationDefs.RepoViewDetail
-    | ToolsOzoneModerationDefs.RepoViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RepoViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RepoViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
index 328812e02f6..47a03ac1b68 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.queryEvents'
 
 export interface QueryParams {
@@ -50,7 +56,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   events: ToolsOzoneModerationDefs.ModEventView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index e730c7cf694..f5baa729535 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.queryStatuses'
 
 export interface QueryParams {
@@ -66,7 +72,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   subjectStatuses: ToolsOzoneModerationDefs.SubjectStatusView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
index 604790371c4..03fe5e1c989 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.moderation.searchRepos'
 
 export interface QueryParams {
@@ -24,7 +30,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: ToolsOzoneModerationDefs.RepoView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts b/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
index e047acf71d4..33b66d50b31 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.server.getConfig'
 
 export interface QueryParams {}
@@ -20,7 +26,6 @@ export interface OutputSchema {
   blobDivert?: ServiceConfig
   chat?: ServiceConfig
   viewer?: ViewerConfig
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -49,45 +54,43 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface ServiceConfig {
+  $type?: $Type<'tools.ozone.server.getConfig', 'serviceConfig'>
   url?: string
-  [k: string]: unknown
 }
 
-export function isServiceConfig(
-  v: unknown,
-): v is ServiceConfig & {
-  $type: $Type<'tools.ozone.server.getConfig', 'serviceConfig'>
-} {
-  return is$typed(v, id, 'serviceConfig')
+const hashServiceConfig = 'serviceConfig'
+
+export function isServiceConfig<V>(v: V) {
+  return is$typed(v, id, hashServiceConfig)
+}
+
+export function validateServiceConfig<V>(v: V) {
+  return validate<ServiceConfig & V>(v, id, hashServiceConfig)
 }
 
-export function validateServiceConfig(v: unknown) {
-  return lexicons.validate(
-    `${id}#serviceConfig`,
-    v,
-  ) as ValidationResult<ServiceConfig>
+export function isValidServiceConfig<V>(v: V) {
+  return isValid<ServiceConfig>(v, id, hashServiceConfig)
 }
 
 export interface ViewerConfig {
+  $type?: $Type<'tools.ozone.server.getConfig', 'viewerConfig'>
   role?:
     | 'tools.ozone.team.defs#roleAdmin'
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isViewerConfig(
-  v: unknown,
-): v is ViewerConfig & {
-  $type: $Type<'tools.ozone.server.getConfig', 'viewerConfig'>
-} {
-  return is$typed(v, id, 'viewerConfig')
+const hashViewerConfig = 'viewerConfig'
+
+export function isViewerConfig<V>(v: V) {
+  return is$typed(v, id, hashViewerConfig)
+}
+
+export function validateViewerConfig<V>(v: V) {
+  return validate<ViewerConfig & V>(v, id, hashViewerConfig)
 }
 
-export function validateViewerConfig(v: unknown) {
-  return lexicons.validate(
-    `${id}#viewerConfig`,
-    v,
-  ) as ValidationResult<ViewerConfig>
+export function isValidViewerConfig<V>(v: V) {
+  return isValid<ViewerConfig>(v, id, hashViewerConfig)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
index 15290b1da5a..0ad224fd32d 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.addValues'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to add to the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
index 60be9fcb90d..7353057bbef 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
@@ -3,42 +3,56 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.defs'
 
 export interface Set {
+  $type?: $Type<'tools.ozone.set.defs', 'set'>
   name: string
   description?: string
-  [k: string]: unknown
 }
 
-export function isSet(
-  v: unknown,
-): v is Set & { $type: $Type<'tools.ozone.set.defs', 'set'> } {
-  return is$typed(v, id, 'set')
+const hashSet = 'set'
+
+export function isSet<V>(v: V) {
+  return is$typed(v, id, hashSet)
+}
+
+export function validateSet<V>(v: V) {
+  return validate<Set & V>(v, id, hashSet)
 }
 
-export function validateSet(v: unknown) {
-  return lexicons.validate(`${id}#set`, v) as ValidationResult<Set>
+export function isValidSet<V>(v: V) {
+  return isValid<Set>(v, id, hashSet)
 }
 
 export interface SetView {
+  $type?: $Type<'tools.ozone.set.defs', 'setView'>
   name: string
   description?: string
   setSize: number
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isSetView(
-  v: unknown,
-): v is SetView & { $type: $Type<'tools.ozone.set.defs', 'setView'> } {
-  return is$typed(v, id, 'setView')
+const hashSetView = 'setView'
+
+export function isSetView<V>(v: V) {
+  return is$typed(v, id, hashSetView)
+}
+
+export function validateSetView<V>(v: V) {
+  return validate<SetView & V>(v, id, hashSetView)
 }
 
-export function validateSetView(v: unknown) {
-  return lexicons.validate(`${id}#setView`, v) as ValidationResult<SetView>
+export function isValidSetView<V>(v: V) {
+  return isValid<SetView>(v, id, hashSetView)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts b/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
index 997a74925b8..18fbf502ce5 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.deleteSet'
 
 export interface QueryParams {}
@@ -15,12 +21,9 @@ export interface QueryParams {}
 export interface InputSchema {
   /** Name of the set to delete */
   name: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
index 8f9a6bd91e5..4468c1982ae 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.deleteValues'
 
 export interface QueryParams {}
@@ -17,7 +23,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to delete from the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
index dca0e183a00..57c2b2f6a31 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.getValues'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export interface OutputSchema {
   set: ToolsOzoneSetDefs.SetView
   values: string[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts b/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
index 34531052800..bdbda5a02f8 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.querySets'
 
 export interface QueryParams {
@@ -25,7 +31,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   sets: ToolsOzoneSetDefs.SetView[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts b/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
index 15af30df6b3..7705bd3a27c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.set.upsertSet'
 
 export interface QueryParams {}
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
index c903a0bf88d..380567ec66e 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
@@ -3,15 +3,22 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.defs'
 
 export interface Option {
+  $type?: $Type<'tools.ozone.setting.defs', 'option'>
   key: string
   did: string
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   createdAt?: string
   updatedAt?: string
@@ -23,15 +30,18 @@ export interface Option {
   scope: 'instance' | 'personal' | (string & {})
   createdBy: string
   lastUpdatedBy: string
-  [k: string]: unknown
 }
 
-export function isOption(
-  v: unknown,
-): v is Option & { $type: $Type<'tools.ozone.setting.defs', 'option'> } {
-  return is$typed(v, id, 'option')
+const hashOption = 'option'
+
+export function isOption<V>(v: V) {
+  return is$typed(v, id, hashOption)
+}
+
+export function validateOption<V>(v: V) {
+  return validate<Option & V>(v, id, hashOption)
 }
 
-export function validateOption(v: unknown) {
-  return lexicons.validate(`${id}#option`, v) as ValidationResult<Option>
+export function isValidOption<V>(v: V) {
+  return isValid<Option>(v, id, hashOption)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
index 4d18360c027..f76f66e75b3 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSettingDefs from './defs'
+import type * as ToolsOzoneSettingDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.listOptions'
 
 export interface QueryParams {
@@ -26,7 +32,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   options: ToolsOzoneSettingDefs.Option[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
index 108b8033ae9..f95cd96b6ff 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
@@ -4,10 +4,16 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.removeOptions'
 
 export interface QueryParams {}
@@ -15,12 +21,9 @@ export interface QueryParams {}
 export interface InputSchema {
   keys: string[]
   scope: 'instance' | 'personal' | (string & {})
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
index f0492775e2a..34c67ac2fe3 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSettingDefs from './defs'
+import type * as ToolsOzoneSettingDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.setting.upsertOption'
 
 export interface QueryParams {}
@@ -16,19 +22,17 @@ export interface QueryParams {}
 export interface InputSchema {
   key: string
   scope: 'instance' | 'personal' | (string & {})
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   managerRole?:
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | 'tools.ozone.team.defs#roleAdmin'
     | (string & {})
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   option: ToolsOzoneSettingDefs.Option
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
index 59680e98758..361ed968924 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
@@ -3,25 +3,33 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
+  $type?: $Type<'tools.ozone.signature.defs', 'sigDetail'>
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isSigDetail(
-  v: unknown,
-): v is SigDetail & {
-  $type: $Type<'tools.ozone.signature.defs', 'sigDetail'>
-} {
-  return is$typed(v, id, 'sigDetail')
+const hashSigDetail = 'sigDetail'
+
+export function isSigDetail<V>(v: V) {
+  return is$typed(v, id, hashSigDetail)
+}
+
+export function validateSigDetail<V>(v: V) {
+  return validate<SigDetail & V>(v, id, hashSigDetail)
 }
 
-export function validateSigDetail(v: unknown) {
-  return lexicons.validate(`${id}#sigDetail`, v) as ValidationResult<SigDetail>
+export function isValidSigDetail<V>(v: V) {
+  return isValid<SigDetail>(v, id, hashSigDetail)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
index 93070d36f52..da5627f7a75 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSignatureDefs from './defs'
+import type * as ToolsOzoneSignatureDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.findCorrelation'
 
 export interface QueryParams {
@@ -19,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   details: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
index 37e59dc28ab..58dd130d3c6 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -4,12 +4,18 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ToolsOzoneSignatureDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ToolsOzoneSignatureDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.findRelatedAccounts'
 
 export interface QueryParams {
@@ -23,7 +29,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: RelatedAccount[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -52,22 +57,21 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RelatedAccount {
+  $type?: $Type<'tools.ozone.signature.findRelatedAccounts', 'relatedAccount'>
   account: ComAtprotoAdminDefs.AccountView
   similarities?: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
-export function isRelatedAccount(
-  v: unknown,
-): v is RelatedAccount & {
-  $type: $Type<'tools.ozone.signature.findRelatedAccounts', 'relatedAccount'>
-} {
-  return is$typed(v, id, 'relatedAccount')
+const hashRelatedAccount = 'relatedAccount'
+
+export function isRelatedAccount<V>(v: V) {
+  return is$typed(v, id, hashRelatedAccount)
+}
+
+export function validateRelatedAccount<V>(v: V) {
+  return validate<RelatedAccount & V>(v, id, hashRelatedAccount)
 }
 
-export function validateRelatedAccount(v: unknown) {
-  return lexicons.validate(
-    `${id}#relatedAccount`,
-    v,
-  ) as ValidationResult<RelatedAccount>
+export function isValidRelatedAccount<V>(v: V) {
+  return isValid<RelatedAccount>(v, id, hashRelatedAccount)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
index 7b1484c8619..38e6bd95d20 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.signature.searchAccounts'
 
 export interface QueryParams {
@@ -22,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
index 288313038be..6093ec7901b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.addMember'
 
 export interface QueryParams {}
@@ -20,7 +26,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
index d6e51429c77..3a56797e596 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
@@ -3,13 +3,20 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.defs'
 
 export interface Member {
+  $type?: $Type<'tools.ozone.team.defs', 'member'>
   did: string
   disabled?: boolean
   profile?: AppBskyActorDefs.ProfileViewDetailed
@@ -21,17 +28,20 @@ export interface Member {
     | 'lex:tools.ozone.team.defs#roleModerator'
     | 'lex:tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isMember(
-  v: unknown,
-): v is Member & { $type: $Type<'tools.ozone.team.defs', 'member'> } {
-  return is$typed(v, id, 'member')
+const hashMember = 'member'
+
+export function isMember<V>(v: V) {
+  return is$typed(v, id, hashMember)
+}
+
+export function validateMember<V>(v: V) {
+  return validate<Member & V>(v, id, hashMember)
 }
 
-export function validateMember(v: unknown) {
-  return lexicons.validate(`${id}#member`, v) as ValidationResult<Member>
+export function isValidMember<V>(v: V) {
+  return isValid<Member>(v, id, hashMember)
 }
 
 /** Admin role. Highest level of access, can perform all actions. */
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
index b6f0c8c2997..5adad6d468c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
@@ -4,17 +4,22 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.deleteMember'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
index 9dffdbad5ce..ea672a80186 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
@@ -21,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   members: ToolsOzoneTeamDefs.Member[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
index d770b8fafb3..0b0d704b4a6 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
@@ -4,11 +4,17 @@
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import { lexicons } from '../../../../lexicons'
-import { $Type, is$typed } from '../../../../util'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs'
 
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
 const id = 'tools.ozone.team.updateMember'
 
 export interface QueryParams {}
@@ -21,7 +27,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/pds/src/lexicon/util.ts b/packages/pds/src/lexicon/util.ts
index a8b8cc9e0b7..2d83b0960f1 100644
--- a/packages/pds/src/lexicon/util.ts
+++ b/packages/pds/src/lexicon/util.ts
@@ -1,39 +1,62 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
+export type OmitKey<T, K extends keyof T> = {
+  [K2 in keyof T as K2 extends K ? never : K2]: T[K2]
+}
+
 export type $Typed<V> = V & { $type: string }
 
 export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
   ? Id | `${Id}#${Hash}`
   : `${Id}#${Hash}`
 
-function has$type<V>(v: V): v is $Typed<V & object> {
-  return (
-    v != null &&
-    typeof v === 'object' &&
-    '$type' in v &&
-    typeof v.$type === 'string'
-  )
+function isObject<V>(v: V): v is V & object {
+  return v != null && typeof v === 'object'
 }
 
 function check$type<Id extends string, Hash extends string>(
-  $type: string,
+  $type: unknown,
   id: Id,
   hash: Hash,
 ): $type is $Type<Id, Hash> {
   return $type === id
     ? hash === 'main'
     : // $type === `${id}#${hash}`
-      $type.length === id.length + 1 + hash.length &&
+      typeof $type === 'string' &&
+        $type.length === id.length + 1 + hash.length &&
         $type.charCodeAt(id.length) === 35 /* '#' */ &&
         $type.startsWith(id) &&
         $type.endsWith(hash)
 }
 
+export type Is$Typed<V, Id extends string, Hash extends string> = V extends {
+  $type: $Type<Id, Hash>
+}
+  ? V
+  : V extends { $type?: string }
+    ? V extends { $type?: $Type<Id, Hash> }
+      ? $Typed<V>
+      : never
+    : V & { $type: $Type<Id, Hash> }
+
 export function is$typed<V, Id extends string, Hash extends string>(
   v: V,
   id: Id,
   hash: Hash,
-): v is V & object & { $type: $Type<Id, Hash> } {
-  return has$type(v) && check$type(v.$type, id, hash)
+): v is Is$Typed<V, Id, Hash> {
+  return isObject(v) && '$type' in v && check$type(v.$type, id, hash)
+}
+
+export function maybe$typed<V, Id extends string, Hash extends string>(
+  v: V,
+  id: Id,
+  hash: Hash,
+): v is V & object & { $type?: $Type<Id, Hash> } {
+  return (
+    isObject(v) &&
+    ('$type' in v
+      ? v.$type === undefined || check$type(v.$type, id, hash)
+      : true)
+  )
 }