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 c6392632de0..1efd63e75a3 100644
--- a/packages/api/src/client/types/app/bsky/actor/defs.ts
+++ b/packages/api/src/client/types/app/bsky/actor/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
 
+export const id = 'app.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,16 +23,17 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(
+  v: unknown,
+): v is ProfileViewBasic & { $type: 'app.bsky.actor.defs#profileViewBasic' } {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
 
 export interface ProfileView {
@@ -47,16 +50,17 @@ export interface ProfileView {
   [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+export function isProfileView(
+  v: unknown,
+): v is ProfileView & { $type: 'app.bsky.actor.defs#profileView' } {
+  return is$typed(v, id, 'profileView')
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileView`,
+    v,
+  ) as ValidationResult<ProfileView>
 }
 
 export interface ProfileViewDetailed {
@@ -79,16 +83,17 @@ export interface ProfileViewDetailed {
   [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed & {
+  $type: 'app.bsky.actor.defs#profileViewDetailed'
+} {
+  return is$typed(v, id, 'profileViewDetailed')
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewDetailed`,
+    v,
+  ) as ValidationResult<ProfileViewDetailed>
 }
 
 export interface ProfileAssociated {
@@ -100,16 +105,17 @@ export interface ProfileAssociated {
   [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+export function isProfileAssociated(
+  v: unknown,
+): v is ProfileAssociated & { $type: 'app.bsky.actor.defs#profileAssociated' } {
+  return is$typed(v, id, 'profileAssociated')
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociated`,
+    v,
+  ) as ValidationResult<ProfileAssociated>
 }
 
 export interface ProfileAssociatedChat {
@@ -119,16 +125,17 @@ export interface ProfileAssociatedChat {
 
 export function isProfileAssociatedChat(
   v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+): v is ProfileAssociatedChat & {
+  $type: 'app.bsky.actor.defs#profileAssociatedChat'
+} {
+  return is$typed(v, id, 'profileAssociatedChat')
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociatedChat`,
+    v,
+  ) as ValidationResult<ProfileAssociatedChat>
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
@@ -144,16 +151,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: 'app.bsky.actor.defs#viewerState' } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 /** The subject's followers whom you also follow */
@@ -163,16 +171,17 @@ export interface KnownFollowers {
   [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+export function isKnownFollowers(
+  v: unknown,
+): v is KnownFollowers & { $type: 'app.bsky.actor.defs#knownFollowers' } {
+  return is$typed(v, id, 'knownFollowers')
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers(v: unknown) {
+  return lexicons.validate(
+    `${id}#knownFollowers`,
+    v,
+  ) as ValidationResult<KnownFollowers>
 }
 
 export type Preferences = (
@@ -196,16 +205,17 @@ export interface AdultContentPref {
   [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+export function isAdultContentPref(
+  v: unknown,
+): v is AdultContentPref & { $type: 'app.bsky.actor.defs#adultContentPref' } {
+  return is$typed(v, id, 'adultContentPref')
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#adultContentPref`,
+    v,
+  ) as ValidationResult<AdultContentPref>
 }
 
 export interface ContentLabelPref {
@@ -216,16 +226,17 @@ export interface ContentLabelPref {
   [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+export function isContentLabelPref(
+  v: unknown,
+): v is ContentLabelPref & { $type: 'app.bsky.actor.defs#contentLabelPref' } {
+  return is$typed(v, id, 'contentLabelPref')
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#contentLabelPref`,
+    v,
+  ) as ValidationResult<ContentLabelPref>
 }
 
 export interface SavedFeed {
@@ -236,16 +247,14 @@ export interface SavedFeed {
   [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+export function isSavedFeed(
+  v: unknown,
+): v is SavedFeed & { $type: 'app.bsky.actor.defs#savedFeed' } {
+  return is$typed(v, id, 'savedFeed')
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed(v: unknown) {
+  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
 }
 
 export interface SavedFeedsPrefV2 {
@@ -253,16 +262,17 @@ export interface SavedFeedsPrefV2 {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+export function isSavedFeedsPrefV2(
+  v: unknown,
+): v is SavedFeedsPrefV2 & { $type: 'app.bsky.actor.defs#savedFeedsPrefV2' } {
+  return is$typed(v, id, 'savedFeedsPrefV2')
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPrefV2`,
+    v,
+  ) as ValidationResult<SavedFeedsPrefV2>
 }
 
 export interface SavedFeedsPref {
@@ -272,16 +282,17 @@ export interface SavedFeedsPref {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+export function isSavedFeedsPref(
+  v: unknown,
+): v is SavedFeedsPref & { $type: 'app.bsky.actor.defs#savedFeedsPref' } {
+  return is$typed(v, id, 'savedFeedsPref')
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPref`,
+    v,
+  ) as ValidationResult<SavedFeedsPref>
 }
 
 export interface PersonalDetailsPref {
@@ -290,16 +301,17 @@ export interface PersonalDetailsPref {
   [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref & {
+  $type: 'app.bsky.actor.defs#personalDetailsPref'
+} {
+  return is$typed(v, id, 'personalDetailsPref')
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#personalDetailsPref`,
+    v,
+  ) as ValidationResult<PersonalDetailsPref>
 }
 
 export interface FeedViewPref {
@@ -318,16 +330,17 @@ export interface FeedViewPref {
   [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+export function isFeedViewPref(
+  v: unknown,
+): v is FeedViewPref & { $type: 'app.bsky.actor.defs#feedViewPref' } {
+  return is$typed(v, id, 'feedViewPref')
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPref`,
+    v,
+  ) as ValidationResult<FeedViewPref>
 }
 
 export interface ThreadViewPref {
@@ -338,16 +351,17 @@ export interface ThreadViewPref {
   [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+export function isThreadViewPref(
+  v: unknown,
+): v is ThreadViewPref & { $type: 'app.bsky.actor.defs#threadViewPref' } {
+  return is$typed(v, id, 'threadViewPref')
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPref`,
+    v,
+  ) as ValidationResult<ThreadViewPref>
 }
 
 export interface InterestsPref {
@@ -356,16 +370,17 @@ export interface InterestsPref {
   [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+export function isInterestsPref(
+  v: unknown,
+): v is InterestsPref & { $type: 'app.bsky.actor.defs#interestsPref' } {
+  return is$typed(v, id, 'interestsPref')
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#interestsPref`,
+    v,
+  ) as ValidationResult<InterestsPref>
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
@@ -384,16 +399,14 @@ export interface MutedWord {
   [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+export function isMutedWord(
+  v: unknown,
+): v is MutedWord & { $type: 'app.bsky.actor.defs#mutedWord' } {
+  return is$typed(v, id, 'mutedWord')
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord(v: unknown) {
+  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
 }
 
 export interface MutedWordsPref {
@@ -402,16 +415,17 @@ export interface MutedWordsPref {
   [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+export function isMutedWordsPref(
+  v: unknown,
+): v is MutedWordsPref & { $type: 'app.bsky.actor.defs#mutedWordsPref' } {
+  return is$typed(v, id, 'mutedWordsPref')
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#mutedWordsPref`,
+    v,
+  ) as ValidationResult<MutedWordsPref>
 }
 
 export interface HiddenPostsPref {
@@ -420,16 +434,17 @@ export interface HiddenPostsPref {
   [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+export function isHiddenPostsPref(
+  v: unknown,
+): v is HiddenPostsPref & { $type: 'app.bsky.actor.defs#hiddenPostsPref' } {
+  return is$typed(v, id, 'hiddenPostsPref')
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#hiddenPostsPref`,
+    v,
+  ) as ValidationResult<HiddenPostsPref>
 }
 
 export interface LabelersPref {
@@ -437,16 +452,17 @@ export interface LabelersPref {
   [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+export function isLabelersPref(
+  v: unknown,
+): v is LabelersPref & { $type: 'app.bsky.actor.defs#labelersPref' } {
+  return is$typed(v, id, 'labelersPref')
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelersPref`,
+    v,
+  ) as ValidationResult<LabelersPref>
 }
 
 export interface LabelerPrefItem {
@@ -454,16 +470,17 @@ export interface LabelerPrefItem {
   [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+export function isLabelerPrefItem(
+  v: unknown,
+): v is LabelerPrefItem & { $type: 'app.bsky.actor.defs#labelerPrefItem' } {
+  return is$typed(v, id, 'labelerPrefItem')
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPrefItem`,
+    v,
+  ) as ValidationResult<LabelerPrefItem>
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
@@ -476,16 +493,17 @@ export interface BskyAppStatePref {
   [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+export function isBskyAppStatePref(
+  v: unknown,
+): v is BskyAppStatePref & { $type: 'app.bsky.actor.defs#bskyAppStatePref' } {
+  return is$typed(v, id, 'bskyAppStatePref')
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppStatePref`,
+    v,
+  ) as ValidationResult<BskyAppStatePref>
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
@@ -494,16 +512,19 @@ export interface BskyAppProgressGuide {
   [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+export function isBskyAppProgressGuide(
+  v: unknown,
+): v is BskyAppProgressGuide & {
+  $type: 'app.bsky.actor.defs#bskyAppProgressGuide'
+} {
+  return is$typed(v, id, 'bskyAppProgressGuide')
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppProgressGuide`,
+    v,
+  ) as ValidationResult<BskyAppProgressGuide>
 }
 
 /** A new user experiences (NUX) storage object */
@@ -517,12 +538,12 @@ export interface Nux {
   [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+export function isNux(
+  v: unknown,
+): v is Nux & { $type: 'app.bsky.actor.defs#nux' } {
+  return is$typed(v, id, 'nux')
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux(v: unknown) {
+  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
 }
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 6cc35cc3c62..ac06a1d779a 100644
--- a/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getPreferences'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 13618b6c2f7..32181c788e8 100644
--- a/packages/api/src/client/types/app/bsky/actor/getProfile.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getProfile.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getProfile'
+
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
   actor: string
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 2207218ac69..4e1b44442ad 100644
--- a/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getProfiles'
+
 export interface QueryParams {
   actors: string[]
 }
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 48553fd1b85..c0ecf0b6c2b 100644
--- a/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getSuggestions'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 c109e93f9ab..a1cb6db9742 100644
--- a/packages/api/src/client/types/app/bsky/actor/profile.ts
+++ b/packages/api/src/client/types/app/bsky/actor/profile.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.actor.profile'
+
 export interface Record {
   displayName?: string
   /** Free-form profile description text. */
@@ -25,15 +27,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.actor.profile#main' | 'app.bsky.actor.profile'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 834b1bd247c..9169ef89e64 100644
--- a/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 bcbde2b7bfb..c4683332472 100644
--- a/packages/api/src/client/types/app/bsky/actor/searchActors.ts
+++ b/packages/api/src/client/types/app/bsky/actor/searchActors.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.searchActors'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
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 abed0289f27..26ab6cc2400 100644
--- a/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.searchActorsTypeahead'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
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 b7b753d65f6..7cb8d07c63d 100644
--- a/packages/api/src/client/types/app/bsky/embed/defs.ts
+++ b/packages/api/src/client/types/app/bsky/embed/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export 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 {
@@ -13,14 +15,15 @@ export interface AspectRatio {
   [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+export function isAspectRatio(
+  v: unknown,
+): v is AspectRatio & { $type: 'app.bsky.embed.defs#aspectRatio' } {
+  return is$typed(v, id, 'aspectRatio')
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio(v: unknown) {
+  return lexicons.validate(
+    `${id}#aspectRatio`,
+    v,
+  ) as ValidationResult<AspectRatio>
 }
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 5832cbb3987..a7a53c24c01 100644
--- a/packages/api/src/client/types/app/bsky/embed/external.ts
+++ b/packages/api/src/client/types/app/bsky/embed/external.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export 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 {
@@ -12,17 +14,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.external#main' | 'app.bsky.embed.external'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface External {
@@ -33,16 +32,14 @@ export interface External {
   [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+export function isExternal(
+  v: unknown,
+): v is External & { $type: 'app.bsky.embed.external#external' } {
+  return is$typed(v, id, 'external')
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal(v: unknown) {
+  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
 }
 
 export interface View {
@@ -50,16 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.external#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewExternal {
@@ -70,14 +65,15 @@ export interface ViewExternal {
   [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+export function isViewExternal(
+  v: unknown,
+): v is ViewExternal & { $type: 'app.bsky.embed.external#viewExternal' } {
+  return is$typed(v, id, 'viewExternal')
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewExternal`,
+    v,
+  ) as ValidationResult<ViewExternal>
 }
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 886ad7c5c5b..16388024408 100644
--- a/packages/api/src/client/types/app/bsky/embed/images.ts
+++ b/packages/api/src/client/types/app/bsky/embed/images.ts
@@ -2,27 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyEmbedDefs from './defs'
 
+export const id = 'app.bsky.embed.images'
+
 export interface Main {
   images: Image[]
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.images#main' | 'app.bsky.embed.images'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Image {
@@ -33,14 +32,14 @@ export interface Image {
   [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+export function isImage(
+  v: unknown,
+): v is Image & { $type: 'app.bsky.embed.images#image' } {
+  return is$typed(v, id, 'image')
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage(v: unknown) {
+  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.images#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewImage {
@@ -69,14 +68,12 @@ export interface ViewImage {
   [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+export function isViewImage(
+  v: unknown,
+): v is ViewImage & { $type: 'app.bsky.embed.images#viewImage' } {
+  return is$typed(v, id, 'viewImage')
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage(v: unknown) {
+  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
 }
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 a3744c29246..464652c09c5 100644
--- a/packages/api/src/client/types/app/bsky/embed/record.ts
+++ b/packages/api/src/client/types/app/bsky/embed/record.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
@@ -16,22 +16,21 @@ import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
 
+export const id = 'app.bsky.embed.record'
+
 export interface Main {
   record: ComAtprotoRepoStrongRef.Main
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.record#main' | 'app.bsky.embed.record'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.record#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewRecord {
@@ -81,16 +80,17 @@ export interface ViewRecord {
   [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+export function isViewRecord(
+  v: unknown,
+): v is ViewRecord & { $type: 'app.bsky.embed.record#viewRecord' } {
+  return is$typed(v, id, 'viewRecord')
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewRecord`,
+    v,
+  ) as ValidationResult<ViewRecord>
 }
 
 export interface ViewNotFound {
@@ -99,16 +99,17 @@ export interface ViewNotFound {
   [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+export function isViewNotFound(
+  v: unknown,
+): v is ViewNotFound & { $type: 'app.bsky.embed.record#viewNotFound' } {
+  return is$typed(v, id, 'viewNotFound')
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewNotFound`,
+    v,
+  ) as ValidationResult<ViewNotFound>
 }
 
 export interface ViewBlocked {
@@ -118,16 +119,17 @@ export interface ViewBlocked {
   [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+export function isViewBlocked(
+  v: unknown,
+): v is ViewBlocked & { $type: 'app.bsky.embed.record#viewBlocked' } {
+  return is$typed(v, id, 'viewBlocked')
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewBlocked`,
+    v,
+  ) as ValidationResult<ViewBlocked>
 }
 
 export interface ViewDetached {
@@ -136,14 +138,15 @@ export interface ViewDetached {
   [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+export function isViewDetached(
+  v: unknown,
+): v is ViewDetached & { $type: 'app.bsky.embed.record#viewDetached' } {
+  return is$typed(v, id, 'viewDetached')
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewDetached`,
+    v,
+  ) as ValidationResult<ViewDetached>
 }
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 2b2b3ae6251..56265087d2f 100644
--- a/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
 
+export const id = 'app.bsky.embed.recordWithMedia'
+
 export interface Main {
   record: AppBskyEmbedRecord.Main
   media:
@@ -20,17 +22,16 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type:
+    | 'app.bsky.embed.recordWithMedia#main'
+    | 'app.bsky.embed.recordWithMedia'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -43,14 +44,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.recordWithMedia#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
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 2be451b85ed..3d549daec28 100644
--- a/packages/api/src/client/types/app/bsky/embed/video.ts
+++ b/packages/api/src/client/types/app/bsky/embed/video.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyEmbedDefs from './defs'
 
+export const id = 'app.bsky.embed.video'
+
 export interface Main {
   video: BlobRef
   captions?: Caption[]
@@ -16,17 +18,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: 'app.bsky.embed.video#main' | 'app.bsky.embed.video' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Caption {
@@ -35,16 +34,14 @@ export interface Caption {
   [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+export function isCaption(
+  v: unknown,
+): v is Caption & { $type: 'app.bsky.embed.video#caption' } {
+  return is$typed(v, id, 'caption')
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption(v: unknown) {
+  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
 }
 
 export interface View {
@@ -56,12 +53,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.video#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
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 bc50067c1da..26967f1f5a3 100644
--- a/packages/api/src/client/types/app/bsky/feed/defs.ts
+++ b/packages/api/src/client/types/app/bsky/feed/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
@@ -15,6 +15,8 @@ import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyGraphDefs from '../graph/defs'
 
+export const id = 'app.bsky.feed.defs'
+
 export interface PostView {
   uri: string
   cid: string
@@ -38,14 +40,14 @@ export interface PostView {
   [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+export function isPostView(
+  v: unknown,
+): v is PostView & { $type: 'app.bsky.feed.defs#postView' } {
+  return is$typed(v, id, 'postView')
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView(v: unknown) {
+  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
@@ -59,16 +61,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: 'app.bsky.feed.defs#viewerState' } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 export interface FeedViewPost {
@@ -80,16 +83,17 @@ export interface FeedViewPost {
   [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+export function isFeedViewPost(
+  v: unknown,
+): v is FeedViewPost & { $type: 'app.bsky.feed.defs#feedViewPost' } {
+  return is$typed(v, id, 'feedViewPost')
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPost`,
+    v,
+  ) as ValidationResult<FeedViewPost>
 }
 
 export interface ReplyRef {
@@ -107,14 +111,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: 'app.bsky.feed.defs#replyRef' } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 export interface ReasonRepost {
@@ -123,32 +127,31 @@ export interface ReasonRepost {
   [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+export function isReasonRepost(
+  v: unknown,
+): v is ReasonRepost & { $type: 'app.bsky.feed.defs#reasonRepost' } {
+  return is$typed(v, id, 'reasonRepost')
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#reasonRepost`,
+    v,
+  ) as ValidationResult<ReasonRepost>
 }
 
 export interface ReasonPin {
   [k: string]: unknown
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+export function isReasonPin(
+  v: unknown,
+): v is ReasonPin & { $type: 'app.bsky.feed.defs#reasonPin' } {
+  return is$typed(v, id, 'reasonPin')
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin(v: unknown) {
+  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
 }
 
 export interface ThreadViewPost {
@@ -167,16 +170,17 @@ export interface ThreadViewPost {
   [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+export function isThreadViewPost(
+  v: unknown,
+): v is ThreadViewPost & { $type: 'app.bsky.feed.defs#threadViewPost' } {
+  return is$typed(v, id, 'threadViewPost')
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPost`,
+    v,
+  ) as ValidationResult<ThreadViewPost>
 }
 
 export interface NotFoundPost {
@@ -185,16 +189,17 @@ export interface NotFoundPost {
   [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+export function isNotFoundPost(
+  v: unknown,
+): v is NotFoundPost & { $type: 'app.bsky.feed.defs#notFoundPost' } {
+  return is$typed(v, id, 'notFoundPost')
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundPost`,
+    v,
+  ) as ValidationResult<NotFoundPost>
 }
 
 export interface BlockedPost {
@@ -204,16 +209,17 @@ export interface BlockedPost {
   [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+export function isBlockedPost(
+  v: unknown,
+): v is BlockedPost & { $type: 'app.bsky.feed.defs#blockedPost' } {
+  return is$typed(v, id, 'blockedPost')
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedPost`,
+    v,
+  ) as ValidationResult<BlockedPost>
 }
 
 export interface BlockedAuthor {
@@ -222,16 +228,17 @@ export interface BlockedAuthor {
   [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+export function isBlockedAuthor(
+  v: unknown,
+): v is BlockedAuthor & { $type: 'app.bsky.feed.defs#blockedAuthor' } {
+  return is$typed(v, id, 'blockedAuthor')
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedAuthor`,
+    v,
+  ) as ValidationResult<BlockedAuthor>
 }
 
 export interface GeneratorView {
@@ -251,16 +258,17 @@ export interface GeneratorView {
   [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+export function isGeneratorView(
+  v: unknown,
+): v is GeneratorView & { $type: 'app.bsky.feed.defs#generatorView' } {
+  return is$typed(v, id, 'generatorView')
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorView`,
+    v,
+  ) as ValidationResult<GeneratorView>
 }
 
 export interface GeneratorViewerState {
@@ -268,16 +276,19 @@ export interface GeneratorViewerState {
   [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+export function isGeneratorViewerState(
+  v: unknown,
+): v is GeneratorViewerState & {
+  $type: 'app.bsky.feed.defs#generatorViewerState'
+} {
+  return is$typed(v, id, 'generatorViewerState')
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorViewerState`,
+    v,
+  ) as ValidationResult<GeneratorViewerState>
 }
 
 export interface SkeletonFeedPost {
@@ -291,16 +302,17 @@ export interface SkeletonFeedPost {
   [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+export function isSkeletonFeedPost(
+  v: unknown,
+): v is SkeletonFeedPost & { $type: 'app.bsky.feed.defs#skeletonFeedPost' } {
+  return is$typed(v, id, 'skeletonFeedPost')
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonFeedPost`,
+    v,
+  ) as ValidationResult<SkeletonFeedPost>
 }
 
 export interface SkeletonReasonRepost {
@@ -308,32 +320,36 @@ export interface SkeletonReasonRepost {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+export function isSkeletonReasonRepost(
+  v: unknown,
+): v is SkeletonReasonRepost & {
+  $type: 'app.bsky.feed.defs#skeletonReasonRepost'
+} {
+  return is$typed(v, id, 'skeletonReasonRepost')
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonRepost`,
+    v,
+  ) as ValidationResult<SkeletonReasonRepost>
 }
 
 export interface SkeletonReasonPin {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+export function isSkeletonReasonPin(
+  v: unknown,
+): v is SkeletonReasonPin & { $type: 'app.bsky.feed.defs#skeletonReasonPin' } {
+  return is$typed(v, id, 'skeletonReasonPin')
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonPin`,
+    v,
+  ) as ValidationResult<SkeletonReasonPin>
 }
 
 export interface ThreadgateView {
@@ -344,16 +360,17 @@ export interface ThreadgateView {
   [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+export function isThreadgateView(
+  v: unknown,
+): v is ThreadgateView & { $type: 'app.bsky.feed.defs#threadgateView' } {
+  return is$typed(v, id, 'threadgateView')
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadgateView`,
+    v,
+  ) as ValidationResult<ThreadgateView>
 }
 
 export interface Interaction {
@@ -377,16 +394,17 @@ export interface Interaction {
   [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+export function isInteraction(
+  v: unknown,
+): v is Interaction & { $type: 'app.bsky.feed.defs#interaction' } {
+  return is$typed(v, id, 'interaction')
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction(v: unknown) {
+  return lexicons.validate(
+    `${id}#interaction`,
+    v,
+  ) as ValidationResult<Interaction>
 }
 
 /** 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 b974f496144..aa3c0c113c4 100644
--- a/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.feed.describeFeedGenerator'
 
 export interface QueryParams {}
 
@@ -38,16 +40,14 @@ export interface Feed {
   [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+export function isFeed(
+  v: unknown,
+): v is Feed & { $type: 'app.bsky.feed.describeFeedGenerator#feed' } {
+  return is$typed(v, id, 'feed')
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed(v: unknown) {
+  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
 }
 
 export interface Links {
@@ -56,14 +56,12 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: 'app.bsky.feed.describeFeedGenerator#links' } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
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 b36796dd353..82f98bb14bb 100644
--- a/packages/api/src/client/types/app/bsky/feed/generator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/generator.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.feed.generator'
+
 export interface Record {
   did: string
   displayName: string
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.generator#main' | 'app.bsky.feed.generator'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 e8a0cb94bd3..fecdf47e306 100644
--- a/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getActorFeeds'
+
 export interface QueryParams {
   actor: string
   limit?: number
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 1da239d96f3..560dc103622 100644
--- a/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getActorLikes'
+
 export interface QueryParams {
   actor: string
   limit?: number
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 77319f28d40..253092bfb5b 100644
--- a/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getAuthorFeed'
+
 export interface QueryParams {
   actor: string
   limit?: number
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 b61a1248e2a..d5cf360f15c 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeed.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeed'
+
 export interface QueryParams {
   feed: string
   limit?: number
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 8d222f8d521..321a45ce8d5 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedGenerator'
+
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
   feed: string
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 1d99fd6608c..408c429cb28 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedGenerators'
+
 export interface QueryParams {
   feeds: string[]
 }
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 bf859cc1e87..147ecaa0e77 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedSkeleton'
+
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
   feed: string
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 35af1b3aae5..e7e04ff4956 100644
--- a/packages/api/src/client/types/app/bsky/feed/getLikes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getLikes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.feed.getLikes'
+
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
   uri: string
@@ -49,12 +51,12 @@ export interface Like {
   [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+export function isLike(
+  v: unknown,
+): v is Like & { $type: 'app.bsky.feed.getLikes#like' } {
+  return is$typed(v, id, 'like')
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike(v: unknown) {
+  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
 }
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 4e47e597afd..ec3eb4ef5df 100644
--- a/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getListFeed'
+
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
   list: string
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 df012607df1..cc272ecd7ae 100644
--- a/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getPostThread'
+
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
   uri: string
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 0ae8657de94..b35b9c1bbff 100644
--- a/packages/api/src/client/types/app/bsky/feed/getPosts.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getPosts.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getPosts'
+
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
   uris: string[]
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 aafc487cd43..cdb4eb0b5e1 100644
--- a/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getQuotes'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
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 dfbac97453b..8236a7d980b 100644
--- a/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.feed.getRepostedBy'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
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 2e9495d8c19..6a84c6501b8 100644
--- a/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getSuggestedFeeds'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 6c5280443a9..364b7cee7ab 100644
--- a/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getTimeline'
+
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
   algorithm?: string
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 10237e45f0d..d63fd3e3674 100644
--- a/packages/api/src/client/types/app/bsky/feed/like.ts
+++ b/packages/api/src/client/types/app/bsky/feed/like.ts
@@ -2,25 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.like'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.feed.like#main' | 'app.bsky.feed.like' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 e358409c0e0..a5bf1cf4f2c 100644
--- a/packages/api/src/client/types/app/bsky/feed/post.ts
+++ b/packages/api/src/client/types/app/bsky/feed/post.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
@@ -14,6 +14,8 @@ import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.post'
+
 export interface Record {
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
@@ -41,16 +43,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.feed.post#main' | 'app.bsky.feed.post' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface ReplyRef {
@@ -59,14 +59,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: 'app.bsky.feed.post#replyRef' } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 /** Deprecated: use facets instead. */
@@ -78,14 +78,14 @@ export interface Entity {
   [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+export function isEntity(
+  v: unknown,
+): v is Entity & { $type: 'app.bsky.feed.post#entity' } {
+  return is$typed(v, id, 'entity')
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity(v: unknown) {
+  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
@@ -95,14 +95,12 @@ export interface TextSlice {
   [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+export function isTextSlice(
+  v: unknown,
+): v is TextSlice & { $type: 'app.bsky.feed.post#textSlice' } {
+  return is$typed(v, id, 'textSlice')
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice(v: unknown) {
+  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
 }
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 aad8496699a..5f9f88605f6 100644
--- a/packages/api/src/client/types/app/bsky/feed/postgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/postgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.feed.postgate'
 
 export interface Record {
   createdAt: string
@@ -16,17 +18,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.postgate#main' | 'app.bsky.feed.postgate'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Disables embedding of this post. */
@@ -34,14 +33,15 @@ export interface DisableRule {
   [k: string]: unknown
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+export function isDisableRule(
+  v: unknown,
+): v is DisableRule & { $type: 'app.bsky.feed.postgate#disableRule' } {
+  return is$typed(v, id, 'disableRule')
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#disableRule`,
+    v,
+  ) as ValidationResult<DisableRule>
 }
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 2e8f6e75548..17821768dd4 100644
--- a/packages/api/src/client/types/app/bsky/feed/repost.ts
+++ b/packages/api/src/client/types/app/bsky/feed/repost.ts
@@ -2,26 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.repost'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.repost#main' | 'app.bsky.feed.repost'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 1a2ec64dcd2..41542317fac 100644
--- a/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
+++ b/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.searchPosts'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
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 4d43e26f3dd..35076e119de 100644
--- a/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.sendInteractions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 558027fb8e9..b60c59ca0ae 100644
--- a/packages/api/src/client/types/app/bsky/feed/threadgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
   /** Reference (AT-URI) to the post record. */
@@ -21,17 +23,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.threadgate#main' | 'app.bsky.feed.threadgate'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Allow replies from actors mentioned in your post. */
@@ -39,16 +38,17 @@ export interface MentionRule {
   [k: string]: unknown
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+export function isMentionRule(
+  v: unknown,
+): v is MentionRule & { $type: 'app.bsky.feed.threadgate#mentionRule' } {
+  return is$typed(v, id, 'mentionRule')
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#mentionRule`,
+    v,
+  ) as ValidationResult<MentionRule>
 }
 
 /** Allow replies from actors you follow. */
@@ -56,16 +56,17 @@ export interface FollowingRule {
   [k: string]: unknown
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+export function isFollowingRule(
+  v: unknown,
+): v is FollowingRule & { $type: 'app.bsky.feed.threadgate#followingRule' } {
+  return is$typed(v, id, 'followingRule')
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#followingRule`,
+    v,
+  ) as ValidationResult<FollowingRule>
 }
 
 /** Allow replies from actors on a list. */
@@ -74,14 +75,12 @@ export interface ListRule {
   [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+export function isListRule(
+  v: unknown,
+): v is ListRule & { $type: 'app.bsky.feed.threadgate#listRule' } {
+  return is$typed(v, id, 'listRule')
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule(v: unknown) {
+  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
 }
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 f2455fc08a2..7d15965ea4f 100644
--- a/packages/api/src/client/types/app/bsky/graph/block.ts
+++ b/packages/api/src/client/types/app/bsky/graph/block.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.graph.block'
 
 export interface Record {
   /** DID of the account to be blocked. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.block#main' | 'app.bsky.graph.block'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 aa7e2c068b5..463c55e4608 100644
--- a/packages/api/src/client/types/app/bsky/graph/defs.ts
+++ b/packages/api/src/client/types/app/bsky/graph/defs.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
 
+export const id = 'app.bsky.graph.defs'
+
 export interface ListViewBasic {
   uri: string
   cid: string
@@ -23,16 +25,17 @@ export interface ListViewBasic {
   [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+export function isListViewBasic(
+  v: unknown,
+): v is ListViewBasic & { $type: 'app.bsky.graph.defs#listViewBasic' } {
+  return is$typed(v, id, 'listViewBasic')
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewBasic`,
+    v,
+  ) as ValidationResult<ListViewBasic>
 }
 
 export interface ListView {
@@ -51,16 +54,14 @@ export interface ListView {
   [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+export function isListView(
+  v: unknown,
+): v is ListView & { $type: 'app.bsky.graph.defs#listView' } {
+  return is$typed(v, id, 'listView')
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView(v: unknown) {
+  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
 }
 
 export interface ListItemView {
@@ -69,16 +70,17 @@ export interface ListItemView {
   [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+export function isListItemView(
+  v: unknown,
+): v is ListItemView & { $type: 'app.bsky.graph.defs#listItemView' } {
+  return is$typed(v, id, 'listItemView')
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView(v: unknown) {
+  return lexicons.validate(
+    `${id}#listItemView`,
+    v,
+  ) as ValidationResult<ListItemView>
 }
 
 export interface StarterPackView {
@@ -96,16 +98,17 @@ export interface StarterPackView {
   [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+export function isStarterPackView(
+  v: unknown,
+): v is StarterPackView & { $type: 'app.bsky.graph.defs#starterPackView' } {
+  return is$typed(v, id, 'starterPackView')
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackView`,
+    v,
+  ) as ValidationResult<StarterPackView>
 }
 
 export interface StarterPackViewBasic {
@@ -121,16 +124,19 @@ export interface StarterPackViewBasic {
   [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+export function isStarterPackViewBasic(
+  v: unknown,
+): v is StarterPackViewBasic & {
+  $type: 'app.bsky.graph.defs#starterPackViewBasic'
+} {
+  return is$typed(v, id, 'starterPackViewBasic')
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackViewBasic`,
+    v,
+  ) as ValidationResult<StarterPackViewBasic>
 }
 
 export type ListPurpose =
@@ -152,16 +158,17 @@ export interface ListViewerState {
   [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+export function isListViewerState(
+  v: unknown,
+): v is ListViewerState & { $type: 'app.bsky.graph.defs#listViewerState' } {
+  return is$typed(v, id, 'listViewerState')
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewerState`,
+    v,
+  ) as ValidationResult<ListViewerState>
 }
 
 /** indicates that a handle or DID could not be resolved */
@@ -171,16 +178,17 @@ export interface NotFoundActor {
   [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+export function isNotFoundActor(
+  v: unknown,
+): v is NotFoundActor & { $type: 'app.bsky.graph.defs#notFoundActor' } {
+  return is$typed(v, id, 'notFoundActor')
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundActor`,
+    v,
+  ) as ValidationResult<NotFoundActor>
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
@@ -193,14 +201,15 @@ export interface Relationship {
   [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+export function isRelationship(
+  v: unknown,
+): v is Relationship & { $type: 'app.bsky.graph.defs#relationship' } {
+  return is$typed(v, id, 'relationship')
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship(v: unknown) {
+  return lexicons.validate(
+    `${id}#relationship`,
+    v,
+  ) as ValidationResult<Relationship>
 }
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 a68f434f3c8..98a2ce53cb1 100644
--- a/packages/api/src/client/types/app/bsky/graph/follow.ts
+++ b/packages/api/src/client/types/app/bsky/graph/follow.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.graph.follow'
 
 export interface Record {
   subject: string
@@ -12,15 +14,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.follow#main' | 'app.bsky.graph.follow'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 bb374e2318d..bbdc9d53b64 100644
--- a/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getActorStarterPacks'
+
 export interface QueryParams {
   actor: string
   limit?: number
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 f0e4bd96bc8..e997218d8b8 100644
--- a/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getBlocks'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 f55649dc769..558a2a22056 100644
--- a/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getFollowers'
+
 export interface QueryParams {
   actor: string
   limit?: number
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 8570c4a14c0..99463dd8a9b 100644
--- a/packages/api/src/client/types/app/bsky/graph/getFollows.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getFollows.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getFollows'
+
 export interface QueryParams {
   actor: string
   limit?: number
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 f55649dc769..c54201fa324 100644
--- a/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getKnownFollowers'
+
 export interface QueryParams {
   actor: string
   limit?: number
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 bebde2b49c3..1ec913c5fd5 100644
--- a/packages/api/src/client/types/app/bsky/graph/getList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getList.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getList'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
   list: string
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 d3c7ad5ed7b..d2d4bdb1f6b 100644
--- a/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getListBlocks'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 d3c7ad5ed7b..421f161837d 100644
--- a/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getListMutes'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 89a4bfd58df..8059416e4c8 100644
--- a/packages/api/src/client/types/app/bsky/graph/getLists.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getLists.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getLists'
+
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
   actor: string
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 0ee441cf9eb..4daf410a1c2 100644
--- a/packages/api/src/client/types/app/bsky/graph/getMutes.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getMutes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getMutes'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 20194662b71..d5f27ed550c 100644
--- a/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getRelationships'
+
 export interface QueryParams {
   /** Primary account requesting relationships for. */
   actor: string
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 7eafb2d228d..24d385c5df6 100644
--- a/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getStarterPack'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
   starterPack: string
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 50dbfdbaeda..8135073f592 100644
--- a/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getStarterPacks'
+
 export interface QueryParams {
   uris: string[]
 }
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 4747afb19fc..1a94a235b13 100644
--- a/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getSuggestedFollowsByActor'
+
 export interface QueryParams {
   actor: string
 }
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 fec652ccb12..608dc1ed294 100644
--- a/packages/api/src/client/types/app/bsky/graph/list.ts
+++ b/packages/api/src/client/types/app/bsky/graph/list.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
 
+export const id = 'app.bsky.graph.list'
+
 export interface Record {
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.graph.list#main' | 'app.bsky.graph.list' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 e0f02be268f..0d46facaa88 100644
--- a/packages/api/src/client/types/app/bsky/graph/listblock.ts
+++ b/packages/api/src/client/types/app/bsky/graph/listblock.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.graph.listblock'
 
 export interface Record {
   /** Reference (AT-URI) to the mod list record. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.listblock#main' | 'app.bsky.graph.listblock'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 d4fb5631e84..7bf8cb188d3 100644
--- a/packages/api/src/client/types/app/bsky/graph/listitem.ts
+++ b/packages/api/src/client/types/app/bsky/graph/listitem.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.graph.listitem'
 
 export interface Record {
   /** The account which is included on the list. */
@@ -15,15 +17,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.listitem#main' | 'app.bsky.graph.listitem'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 c21c00b2069..bd4a32a2913 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteActor.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.graph.muteActor'
 
 export interface QueryParams {}
 
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 8a0e8586deb..0032a8de795 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.graph.muteActorList'
 
 export interface QueryParams {}
 
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 275ba7a0f22..4aa1fead568 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteThread.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteThread.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.graph.muteThread'
 
 export interface QueryParams {}
 
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 7cb0aa26c3f..9d00727da5a 100644
--- a/packages/api/src/client/types/app/bsky/graph/starterpack.ts
+++ b/packages/api/src/client/types/app/bsky/graph/starterpack.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 
+export const id = 'app.bsky.graph.starterpack'
+
 export interface Record {
   /** Display name for starter pack; can not be empty. */
   name: string
@@ -19,17 +21,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.starterpack#main' | 'app.bsky.graph.starterpack'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface FeedItem {
@@ -37,14 +36,12 @@ export interface FeedItem {
   [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+export function isFeedItem(
+  v: unknown,
+): v is FeedItem & { $type: 'app.bsky.graph.starterpack#feedItem' } {
+  return is$typed(v, id, 'feedItem')
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem(v: unknown) {
+  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
 }
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 c21c00b2069..8c17b2fa744 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.graph.unmuteActor'
 
 export interface QueryParams {}
 
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 8a0e8586deb..218dea9e60d 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.graph.unmuteActorList'
 
 export interface QueryParams {}
 
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 275ba7a0f22..4358a9cffc9 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.graph.unmuteThread'
 
 export interface QueryParams {}
 
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 3d9b1d77f8a..40312d8e414 100644
--- a/packages/api/src/client/types/app/bsky/labeler/defs.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.labeler.defs'
+
 export interface LabelerView {
   uri: string
   cid: string
@@ -19,16 +21,17 @@ export interface LabelerView {
   [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+export function isLabelerView(
+  v: unknown,
+): v is LabelerView & { $type: 'app.bsky.labeler.defs#labelerView' } {
+  return is$typed(v, id, 'labelerView')
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerView`,
+    v,
+  ) as ValidationResult<LabelerView>
 }
 
 export interface LabelerViewDetailed {
@@ -43,16 +46,17 @@ export interface LabelerViewDetailed {
   [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed & {
+  $type: 'app.bsky.labeler.defs#labelerViewDetailed'
+} {
+  return is$typed(v, id, 'labelerViewDetailed')
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewDetailed`,
+    v,
+  ) as ValidationResult<LabelerViewDetailed>
 }
 
 export interface LabelerViewerState {
@@ -60,16 +64,17 @@ export interface LabelerViewerState {
   [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+export function isLabelerViewerState(v: unknown): v is LabelerViewerState & {
+  $type: 'app.bsky.labeler.defs#labelerViewerState'
+} {
+  return is$typed(v, id, 'labelerViewerState')
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewerState`,
+    v,
+  ) as ValidationResult<LabelerViewerState>
 }
 
 export interface LabelerPolicies {
@@ -80,14 +85,15 @@ export interface LabelerPolicies {
   [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+export function isLabelerPolicies(
+  v: unknown,
+): v is LabelerPolicies & { $type: 'app.bsky.labeler.defs#labelerPolicies' } {
+  return is$typed(v, id, 'labelerPolicies')
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPolicies`,
+    v,
+  ) as ValidationResult<LabelerPolicies>
 }
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 688f847d508..aad78070747 100644
--- a/packages/api/src/client/types/app/bsky/labeler/getServices.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/getServices.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyLabelerDefs from './defs'
 
+export const id = 'app.bsky.labeler.getServices'
+
 export interface QueryParams {
   dids: string[]
   detailed?: boolean
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 818249468ec..5e27cce3522 100644
--- a/packages/api/src/client/types/app/bsky/labeler/service.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/service.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyLabelerDefs from './defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.labeler.service'
+
 export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?:
@@ -17,15 +19,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.labeler.service#main' | 'app.bsky.labeler.service'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 00600ea54e7..18d84f74ea6 100644
--- a/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.notification.getUnreadCount'
 
 export interface QueryParams {
   priority?: boolean
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 10a5b7148f2..219ad538c52 100644
--- a/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
+++ b/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
@@ -3,12 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.notification.listNotifications'
+
 export interface QueryParams {
   limit?: number
   priority?: boolean
@@ -63,17 +65,15 @@ export interface Notification {
   [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+export function isNotification(v: unknown): v is Notification & {
+  $type: 'app.bsky.notification.listNotifications#notification'
+} {
+  return is$typed(v, id, 'notification')
 }
 
-export function validateNotification(v: unknown): ValidationResult {
+export function validateNotification(v: unknown) {
   return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
+    `${id}#notification`,
     v,
-  )
+  ) as ValidationResult<Notification>
 }
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 bc79909f459..706151153ae 100644
--- a/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.notification.putPreferences'
 
 export interface QueryParams {}
 
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 ddc9d438537..059a09d39d6 100644
--- a/packages/api/src/client/types/app/bsky/notification/registerPush.ts
+++ b/packages/api/src/client/types/app/bsky/notification/registerPush.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.notification.registerPush'
 
 export interface QueryParams {}
 
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 7151e9b0cd4..098985bd976 100644
--- a/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
+++ b/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.notification.updateSeen'
 
 export interface QueryParams {}
 
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 836136b7dac..66887686674 100644
--- a/packages/api/src/client/types/app/bsky/richtext/facet.ts
+++ b/packages/api/src/client/types/app/bsky/richtext/facet.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
@@ -13,17 +15,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.richtext.facet#main' | 'app.bsky.richtext.facet'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
@@ -32,16 +31,14 @@ export interface Mention {
   [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+export function isMention(
+  v: unknown,
+): v is Mention & { $type: 'app.bsky.richtext.facet#mention' } {
+  return is$typed(v, id, 'mention')
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention(v: unknown) {
+  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
@@ -50,16 +47,14 @@ export interface Link {
   [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+export function isLink(
+  v: unknown,
+): v is Link & { $type: 'app.bsky.richtext.facet#link' } {
+  return is$typed(v, id, 'link')
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink(v: unknown) {
+  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
 }
 
 /** 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'). */
@@ -68,14 +63,14 @@ export interface Tag {
   [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+export function isTag(
+  v: unknown,
+): v is Tag & { $type: 'app.bsky.richtext.facet#tag' } {
+  return is$typed(v, id, 'tag')
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag(v: unknown) {
+  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
 }
 
 /** 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. */
@@ -85,14 +80,12 @@ export interface ByteSlice {
   [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+export function isByteSlice(
+  v: unknown,
+): v is ByteSlice & { $type: 'app.bsky.richtext.facet#byteSlice' } {
+  return is$typed(v, id, 'byteSlice')
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice(v: unknown) {
+  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
 }
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 ecee03578af..b39895c86a7 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/defs.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/defs.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
   uri: string
   [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost & {
+  $type: 'app.bsky.unspecced.defs#skeletonSearchPost'
+} {
+  return is$typed(v, id, 'skeletonSearchPost')
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchPost`,
+    v,
+  ) as ValidationResult<SkeletonSearchPost>
 }
 
 export interface SkeletonSearchActor {
@@ -28,14 +31,15 @@ export interface SkeletonSearchActor {
   [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor & {
+  $type: 'app.bsky.unspecced.defs#skeletonSearchActor'
+} {
+  return is$typed(v, id, 'skeletonSearchActor')
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchActor`,
+    v,
+  ) as ValidationResult<SkeletonSearchActor>
 }
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 d1ee6f7957d..3c0a9ceac7d 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.unspecced.getConfig'
 
 export interface QueryParams {}
 
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 780b4b6641c..34c29584972 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+export const id = 'app.bsky.unspecced.getPopularFeedGenerators'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 6ed519ef212..582fdbd2f65 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
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 0ee04b8e85d..30641bd9ec2 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.unspecced.getTaggedSuggestions'
 
 export interface QueryParams {}
 
@@ -38,17 +40,15 @@ export interface Suggestion {
   [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+export function isSuggestion(v: unknown): v is Suggestion & {
+  $type: 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
+} {
+  return is$typed(v, id, 'suggestion')
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
+export function validateSuggestion(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
+    `${id}#suggestion`,
     v,
-  )
+  ) as ValidationResult<Suggestion>
 }
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 d9fe6737d37..642fc237ddf 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.searchActorsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
   q: string
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 ea0135dde83..a95cd782e91 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.searchPostsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
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 a7ec84316b6..5c715bcd570 100644
--- a/packages/api/src/client/types/app/bsky/video/defs.ts
+++ b/packages/api/src/client/types/app/bsky/video/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
   jobId: string
@@ -19,14 +21,12 @@ export interface JobStatus {
   [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+export function isJobStatus(
+  v: unknown,
+): v is JobStatus & { $type: 'app.bsky.video.defs#jobStatus' } {
+  return is$typed(v, id, 'jobStatus')
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus(v: unknown) {
+  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
 }
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 0e9638311c0..b9dd840f882 100644
--- a/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
+++ b/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyVideoDefs from './defs'
 
+export const id = 'app.bsky.video.getJobStatus'
+
 export interface QueryParams {
   jobId: string
 }
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 4a2f13617b3..8ed0694b833 100644
--- a/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'app.bsky.video.getUploadLimits'
 
 export interface QueryParams {}
 
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 f51ba897bbe..da095e300be 100644
--- a/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
+++ b/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyVideoDefs from './defs'
 
+export const id = 'app.bsky.video.uploadVideo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
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 99b14f45608..22ced0f7739 100644
--- a/packages/api/src/client/types/chat/bsky/actor/declaration.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'chat.bsky.actor.declaration#main' | 'chat.bsky.actor.declaration'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 87aaac96218..a6c356eb248 100644
--- a/packages/api/src/client/types/chat/bsky/actor/defs.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'chat.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,14 +23,15 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(
+  v: unknown,
+): v is ProfileViewBasic & { $type: 'chat.bsky.actor.defs#profileViewBasic' } {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
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 1a045c21c29..70427235641 100644
--- a/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'chat.bsky.actor.deleteAccount'
 
 export interface QueryParams {}
 
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 0142436b05e..42fdbaf2ee7 100644
--- a/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export 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 4908b2dc46a..440d063e1a5 100644
--- a/packages/api/src/client/types/chat/bsky/convo/defs.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
 
+export const id = 'chat.bsky.convo.defs'
+
 export interface MessageRef {
   did: string
   convoId: string
@@ -16,16 +18,17 @@ export interface MessageRef {
   [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+export function isMessageRef(
+  v: unknown,
+): v is MessageRef & { $type: 'chat.bsky.convo.defs#messageRef' } {
+  return is$typed(v, id, 'messageRef')
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageRef`,
+    v,
+  ) as ValidationResult<MessageRef>
 }
 
 export interface MessageInput {
@@ -36,16 +39,17 @@ export interface MessageInput {
   [k: string]: unknown
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+export function isMessageInput(
+  v: unknown,
+): v is MessageInput & { $type: 'chat.bsky.convo.defs#messageInput' } {
+  return is$typed(v, id, 'messageInput')
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageInput`,
+    v,
+  ) as ValidationResult<MessageInput>
 }
 
 export interface MessageView {
@@ -60,16 +64,17 @@ export interface MessageView {
   [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+export function isMessageView(
+  v: unknown,
+): v is MessageView & { $type: 'chat.bsky.convo.defs#messageView' } {
+  return is$typed(v, id, 'messageView')
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageView`,
+    v,
+  ) as ValidationResult<MessageView>
 }
 
 export interface DeletedMessageView {
@@ -80,16 +85,17 @@ export interface DeletedMessageView {
   [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+export function isDeletedMessageView(v: unknown): v is DeletedMessageView & {
+  $type: 'chat.bsky.convo.defs#deletedMessageView'
+} {
+  return is$typed(v, id, 'deletedMessageView')
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#deletedMessageView`,
+    v,
+  ) as ValidationResult<DeletedMessageView>
 }
 
 export interface MessageViewSender {
@@ -97,16 +103,17 @@ export interface MessageViewSender {
   [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+export function isMessageViewSender(v: unknown): v is MessageViewSender & {
+  $type: 'chat.bsky.convo.defs#messageViewSender'
+} {
+  return is$typed(v, id, 'messageViewSender')
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageViewSender`,
+    v,
+  ) as ValidationResult<MessageViewSender>
 }
 
 export interface ConvoView {
@@ -123,16 +130,14 @@ export interface ConvoView {
   [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+export function isConvoView(
+  v: unknown,
+): v is ConvoView & { $type: 'chat.bsky.convo.defs#convoView' } {
+  return is$typed(v, id, 'convoView')
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView(v: unknown) {
+  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
 }
 
 export interface LogBeginConvo {
@@ -141,16 +146,17 @@ export interface LogBeginConvo {
   [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+export function isLogBeginConvo(
+  v: unknown,
+): v is LogBeginConvo & { $type: 'chat.bsky.convo.defs#logBeginConvo' } {
+  return is$typed(v, id, 'logBeginConvo')
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logBeginConvo`,
+    v,
+  ) as ValidationResult<LogBeginConvo>
 }
 
 export interface LogLeaveConvo {
@@ -159,16 +165,17 @@ export interface LogLeaveConvo {
   [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+export function isLogLeaveConvo(
+  v: unknown,
+): v is LogLeaveConvo & { $type: 'chat.bsky.convo.defs#logLeaveConvo' } {
+  return is$typed(v, id, 'logLeaveConvo')
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logLeaveConvo`,
+    v,
+  ) as ValidationResult<LogLeaveConvo>
 }
 
 export interface LogCreateMessage {
@@ -181,16 +188,17 @@ export interface LogCreateMessage {
   [k: string]: unknown
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+export function isLogCreateMessage(
+  v: unknown,
+): v is LogCreateMessage & { $type: 'chat.bsky.convo.defs#logCreateMessage' } {
+  return is$typed(v, id, 'logCreateMessage')
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logCreateMessage`,
+    v,
+  ) as ValidationResult<LogCreateMessage>
 }
 
 export interface LogDeleteMessage {
@@ -203,14 +211,15 @@ export interface LogDeleteMessage {
   [k: string]: unknown
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+export function isLogDeleteMessage(
+  v: unknown,
+): v is LogDeleteMessage & { $type: 'chat.bsky.convo.defs#logDeleteMessage' } {
+  return is$typed(v, id, 'logDeleteMessage')
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logDeleteMessage`,
+    v,
+  ) as ValidationResult<LogDeleteMessage>
 }
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 863d2208cb8..418d9c16df3 100644
--- a/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.deleteMessageForSelf'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b3834234b5f..006e201593a 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getConvo'
+
 export interface QueryParams {
   convoId: string
 }
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 9db44887410..a2cfd16fb14 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getConvoForMembers'
+
 export interface QueryParams {
   members: string[]
 }
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 f1470fd89ba..75c28547557 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getLog.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getLog.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getLog'
+
 export interface QueryParams {
   cursor?: string
 }
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 eea7cba82e1..8949ee87790 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getMessages'
+
 export interface QueryParams {
   convoId: string
   limit?: number
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 4124db1855d..51f07f1f0d4 100644
--- a/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'chat.bsky.convo.leaveConvo'
 
 export interface QueryParams {}
 
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 3cd1ad68516..dce870168ea 100644
--- a/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.listConvos'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 93ac8785db7..a9c109023f1 100644
--- a/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.muteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 e260ba6eee0..f4475c218b0 100644
--- a/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.sendMessage'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 68ff2711df5..0fdf0870b1d 100644
--- a/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.sendMessageBatch'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -43,14 +45,12 @@ export interface BatchItem {
   [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+export function isBatchItem(
+  v: unknown,
+): v is BatchItem & { $type: 'chat.bsky.convo.sendMessageBatch#batchItem' } {
+  return is$typed(v, id, 'batchItem')
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem(v: unknown) {
+  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
 }
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 93ac8785db7..d797a5c9928 100644
--- a/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.unmuteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b7a8041dbd7..b0dac3b7548 100644
--- a/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.updateRead'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6761c9939b5..0eac122abcd 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'chat.bsky.moderation.getActorMetadata'
 
 export interface QueryParams {
   actor: string
@@ -43,14 +45,12 @@ export interface Metadata {
   [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+export function isMetadata(
+  v: unknown,
+): v is Metadata & { $type: 'chat.bsky.moderation.getActorMetadata#metadata' } {
+  return is$typed(v, id, 'metadata')
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata(v: unknown) {
+  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
 }
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 2315bfd4ad8..af76a1a4674 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from '../convo/defs'
 
+export const id = 'chat.bsky.moderation.getMessageContext'
+
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
   convoId?: string
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 d6f0205672e..13f698b928e 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'chat.bsky.moderation.updateActorAccess'
 
 export interface QueryParams {}
 
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 26510680347..c0309202b32 100644
--- a/packages/api/src/client/types/com/atproto/admin/defs.ts
+++ b/packages/api/src/client/types/com/atproto/admin/defs.ts
@@ -2,27 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+export const id = 'com.atproto.admin.defs'
+
 export interface StatusAttr {
   applied: boolean
   ref?: string
   [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+export function isStatusAttr(
+  v: unknown,
+): v is StatusAttr & { $type: 'com.atproto.admin.defs#statusAttr' } {
+  return is$typed(v, id, 'statusAttr')
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr(v: unknown) {
+  return lexicons.validate(
+    `${id}#statusAttr`,
+    v,
+  ) as ValidationResult<StatusAttr>
 }
 
 export interface AccountView {
@@ -41,16 +44,17 @@ export interface AccountView {
   [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+export function isAccountView(
+  v: unknown,
+): v is AccountView & { $type: 'com.atproto.admin.defs#accountView' } {
+  return is$typed(v, id, 'accountView')
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountView`,
+    v,
+  ) as ValidationResult<AccountView>
 }
 
 export interface RepoRef {
@@ -58,16 +62,14 @@ export interface RepoRef {
   [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+export function isRepoRef(
+  v: unknown,
+): v is RepoRef & { $type: 'com.atproto.admin.defs#repoRef' } {
+  return is$typed(v, id, 'repoRef')
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef(v: unknown) {
+  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
 }
 
 export interface RepoBlobRef {
@@ -77,16 +79,17 @@ export interface RepoBlobRef {
   [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+export function isRepoBlobRef(
+  v: unknown,
+): v is RepoBlobRef & { $type: 'com.atproto.admin.defs#repoBlobRef' } {
+  return is$typed(v, id, 'repoBlobRef')
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoBlobRef`,
+    v,
+  ) as ValidationResult<RepoBlobRef>
 }
 
 export interface ThreatSignature {
@@ -95,14 +98,15 @@ export interface ThreatSignature {
   [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+export function isThreatSignature(
+  v: unknown,
+): v is ThreatSignature & { $type: 'com.atproto.admin.defs#threatSignature' } {
+  return is$typed(v, id, 'threatSignature')
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature(v: unknown) {
+  return lexicons.validate(
+    `${id}#threatSignature`,
+    v,
+  ) as ValidationResult<ThreatSignature>
 }
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 72066a656b7..3df4da25b5c 100644
--- a/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.admin.deleteAccount'
 
 export interface QueryParams {}
 
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 8df420239de..58567eea4db 100644
--- a/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.admin.disableAccountInvites'
 
 export interface QueryParams {}
 
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 c264b65dbc2..72760656e42 100644
--- a/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.admin.disableInviteCodes'
 
 export interface QueryParams {}
 
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 094b3dfe0af..653276b81f8 100644
--- a/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.admin.enableAccountInvites'
 
 export interface QueryParams {}
 
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 645b9e613ff..791bb827d13 100644
--- a/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.getAccountInfo'
+
 export interface QueryParams {
   did: string
 }
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 9c1c273b9d9..e327d1918fc 100644
--- a/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.getAccountInfos'
+
 export interface QueryParams {
   dids: string[]
 }
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 faa4c8bed25..4ddd14c386b 100644
--- a/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+export const id = 'com.atproto.admin.getInviteCodes'
+
 export interface QueryParams {
   sort?: 'recent' | 'usage' | (string & {})
   limit?: number
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 f11b514507d..591e393a961 100644
--- a/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,12 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+export const id = 'com.atproto.admin.getSubjectStatus'
+
 export interface QueryParams {
   did?: string
   uri?: string
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 2d22806238c..b2a35381b30 100644
--- a/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.searchAccounts'
+
 export interface QueryParams {
   email?: string
   cursor?: string
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 3f7c06d7070..a44681343b7 100644
--- a/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
+++ b/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.admin.sendEmail'
 
 export interface QueryParams {}
 
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 d13878711a6..7f9e396e2d8 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.admin.updateAccountEmail'
 
 export interface QueryParams {}
 
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 38fbcae1681..fa70b2e190e 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.admin.updateAccountHandle'
 
 export interface QueryParams {}
 
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 412f0facca2..b8a21dfd8c8 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.admin.updateAccountPassword'
 
 export interface QueryParams {}
 
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 d890993cf3a..e7a9dc149f7 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,12 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+export const id = 'com.atproto.admin.updateSubjectStatus'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 a5e4a0296de..6842ec74960 100644
--- a/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.identity.getRecommendedDidCredentials'
 
 export interface QueryParams {}
 
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 dcab71e2558..13b968886d1 100644
--- a/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export 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 32db72138f7..7a4eb18fb77 100644
--- a/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.identity.resolveHandle'
 
 export interface QueryParams {
   /** The handle to resolve. */
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 88c04c5993c..02857779924 100644
--- a/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.identity.signPlcOperation'
 
 export interface QueryParams {}
 
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 74dea9f196d..e5013bd7498 100644
--- a/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.identity.submitPlcOperation'
 
 export interface QueryParams {}
 
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 c01d4887a4a..383873a5f9e 100644
--- a/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
+++ b/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.identity.updateHandle'
 
 export interface QueryParams {}
 
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 131682e550c..53d6a9ae242 100644
--- a/packages/api/src/client/types/com/atproto/label/defs.ts
+++ b/packages/api/src/client/types/com/atproto/label/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
@@ -29,16 +31,14 @@ export interface Label {
   [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+export function isLabel(
+  v: unknown,
+): v is Label & { $type: 'com.atproto.label.defs#label' } {
+  return is$typed(v, id, 'label')
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel(v: unknown) {
+  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
@@ -47,16 +47,17 @@ export interface SelfLabels {
   [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+export function isSelfLabels(
+  v: unknown,
+): v is SelfLabels & { $type: 'com.atproto.label.defs#selfLabels' } {
+  return is$typed(v, id, 'selfLabels')
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels(v: unknown) {
+  return lexicons.validate(
+    `${id}#selfLabels`,
+    v,
+  ) as ValidationResult<SelfLabels>
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
@@ -66,16 +67,14 @@ export interface SelfLabel {
   [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+export function isSelfLabel(
+  v: unknown,
+): v is SelfLabel & { $type: 'com.atproto.label.defs#selfLabel' } {
+  return is$typed(v, id, 'selfLabel')
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel(v: unknown) {
+  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
@@ -94,16 +93,19 @@ export interface LabelValueDefinition {
   [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+export function isLabelValueDefinition(
+  v: unknown,
+): v is LabelValueDefinition & {
+  $type: 'com.atproto.label.defs#labelValueDefinition'
+} {
+  return is$typed(v, id, 'labelValueDefinition')
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelValueDefinition`,
+    v,
+  ) as ValidationResult<LabelValueDefinition>
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
@@ -119,21 +121,17 @@ export interface LabelValueDefinitionStrings {
 
 export function isLabelValueDefinitionStrings(
   v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+): v is LabelValueDefinitionStrings & {
+  $type: 'com.atproto.label.defs#labelValueDefinitionStrings'
+} {
+  return is$typed(v, id, 'labelValueDefinitionStrings')
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
+export function validateLabelValueDefinitionStrings(v: unknown) {
   return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+    `${id}#labelValueDefinitionStrings`,
     v,
-  )
+  ) as ValidationResult<LabelValueDefinitionStrings>
 }
 
 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 615770ec978..a9b122820fb 100644
--- a/packages/api/src/client/types/com/atproto/label/queryLabels.ts
+++ b/packages/api/src/client/types/com/atproto/label/queryLabels.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoLabelDefs from './defs'
 
+export const id = 'com.atproto.label.queryLabels'
+
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
   uriPatterns: string[]
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 044d4d83b30..94798108e80 100644
--- a/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
@@ -3,27 +3,27 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoLabelDefs from './defs'
 
+export const id = 'com.atproto.label.subscribeLabels'
+
 export interface Labels {
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
   [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+export function isLabels(
+  v: unknown,
+): v is Labels & { $type: 'com.atproto.label.subscribeLabels#labels' } {
+  return is$typed(v, id, 'labels')
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels(v: unknown) {
+  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
 }
 
 export interface Info {
@@ -32,14 +32,12 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: 'com.atproto.label.subscribeLabels#info' } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
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 16316f585d4..cffd9f7a274 100644
--- a/packages/api/src/client/types/com/atproto/moderation/createReport.ts
+++ b/packages/api/src/client/types/com/atproto/moderation/createReport.ts
@@ -3,13 +3,15 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
 
+export const id = 'com.atproto.moderation.createReport'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 802cd2bc996..efba369f7f2 100644
--- a/packages/api/src/client/types/com/atproto/moderation/defs.ts
+++ b/packages/api/src/client/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
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 edebf199a44..71cf0be5009 100644
--- a/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
+++ b/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.applyWrites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -62,16 +64,14 @@ export interface Create {
   [k: string]: unknown
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+export function isCreate(
+  v: unknown,
+): v is Create & { $type: 'com.atproto.repo.applyWrites#create' } {
+  return is$typed(v, id, 'create')
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate(v: unknown) {
+  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
 }
 
 /** Operation which updates an existing record. */
@@ -82,16 +82,14 @@ export interface Update {
   [k: string]: unknown
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+export function isUpdate(
+  v: unknown,
+): v is Update & { $type: 'com.atproto.repo.applyWrites#update' } {
+  return is$typed(v, id, 'update')
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate(v: unknown) {
+  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
 }
 
 /** Operation which deletes an existing record. */
@@ -101,16 +99,14 @@ export interface Delete {
   [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+export function isDelete(
+  v: unknown,
+): v is Delete & { $type: 'com.atproto.repo.applyWrites#delete' } {
+  return is$typed(v, id, 'delete')
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete(v: unknown) {
+  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
 }
 
 export interface CreateResult {
@@ -120,16 +116,17 @@ export interface CreateResult {
   [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+export function isCreateResult(
+  v: unknown,
+): v is CreateResult & { $type: 'com.atproto.repo.applyWrites#createResult' } {
+  return is$typed(v, id, 'createResult')
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#createResult`,
+    v,
+  ) as ValidationResult<CreateResult>
 }
 
 export interface UpdateResult {
@@ -139,30 +136,32 @@ export interface UpdateResult {
   [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+export function isUpdateResult(
+  v: unknown,
+): v is UpdateResult & { $type: 'com.atproto.repo.applyWrites#updateResult' } {
+  return is$typed(v, id, 'updateResult')
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#updateResult`,
+    v,
+  ) as ValidationResult<UpdateResult>
 }
 
 export interface DeleteResult {
   [k: string]: unknown
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+export function isDeleteResult(
+  v: unknown,
+): v is DeleteResult & { $type: 'com.atproto.repo.applyWrites#deleteResult' } {
+  return is$typed(v, id, 'deleteResult')
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#deleteResult`,
+    v,
+  ) as ValidationResult<DeleteResult>
 }
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 b0f921ef986..2ffb0279ed1 100644
--- a/packages/api/src/client/types/com/atproto/repo/createRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/createRecord.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.createRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 d4dfaceabf3..ed28497e3b4 100644
--- a/packages/api/src/client/types/com/atproto/repo/defs.ts
+++ b/packages/api/src/client/types/com/atproto/repo/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
   cid: string
@@ -12,14 +14,15 @@ export interface CommitMeta {
   [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+export function isCommitMeta(
+  v: unknown,
+): v is CommitMeta & { $type: 'com.atproto.repo.defs#commitMeta' } {
+  return is$typed(v, id, 'commitMeta')
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta(v: unknown) {
+  return lexicons.validate(
+    `${id}#commitMeta`,
+    v,
+  ) as ValidationResult<CommitMeta>
 }
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 ed06cbc83fc..ffccb071bfa 100644
--- a/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.deleteRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 9b3eb337b5c..9a7c142ac16 100644
--- a/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
+++ b/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.repo.describeRepo'
 
 export interface QueryParams {
   /** The handle or DID of the repo. */
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 85013fb7719..09e44e88bdc 100644
--- a/packages/api/src/client/types/com/atproto/repo/getRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/getRecord.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.repo.getRecord'
 
 export interface QueryParams {
   /** The handle or DID of the repo. */
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 ad093e6ce93..aead1d8d8a4 100644
--- a/packages/api/src/client/types/com/atproto/repo/importRepo.ts
+++ b/packages/api/src/client/types/com/atproto/repo/importRepo.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export 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 9043fd4e1fe..52e23c1dc7e 100644
--- a/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.repo.listMissingBlobs'
 
 export interface QueryParams {
   limit?: number
@@ -41,14 +43,15 @@ export interface RecordBlob {
   [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+export function isRecordBlob(
+  v: unknown,
+): v is RecordBlob & { $type: 'com.atproto.repo.listMissingBlobs#recordBlob' } {
+  return is$typed(v, id, 'recordBlob')
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordBlob`,
+    v,
+  ) as ValidationResult<RecordBlob>
 }
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 4a97572f74d..acb8e1b9c3f 100644
--- a/packages/api/src/client/types/com/atproto/repo/listRecords.ts
+++ b/packages/api/src/client/types/com/atproto/repo/listRecords.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.repo.listRecords'
 
 export interface QueryParams {
   /** The handle or DID of the repo. */
@@ -53,14 +55,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'com.atproto.repo.listRecords#record' } {
+  return is$typed(v, id, 'record')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
 }
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 9cadf9a2c4d..f7d686e572a 100644
--- a/packages/api/src/client/types/com/atproto/repo/putRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/putRecord.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.putRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 a6734ba3a4a..f5e5c3614af 100644
--- a/packages/api/src/client/types/com/atproto/repo/strongRef.ts
+++ b/packages/api/src/client/types/com/atproto/repo/strongRef.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
   uri: string
@@ -12,15 +14,12 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'com.atproto.repo.strongRef#main' | 'com.atproto.repo.strongRef'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
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 9931cc61e9d..829abc7f9da 100644
--- a/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.repo.uploadBlob'
 
 export interface QueryParams {}
 
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 dcab71e2558..17a427789e6 100644
--- a/packages/api/src/client/types/com/atproto/server/activateAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/activateAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export 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 b527cca2b67..6feb4c0afa4 100644
--- a/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.checkAccountStatus'
 
 export interface QueryParams {}
 
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 488de314fd6..4111d7e050d 100644
--- a/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
+++ b/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.confirmEmail'
 
 export interface QueryParams {}
 
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 5f0a8d6ad0f..1ded7745451 100644
--- a/packages/api/src/client/types/com/atproto/server/createAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/createAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.createAccount'
 
 export interface QueryParams {}
 
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 05ee6b1314e..b9e7b7db0d5 100644
--- a/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.createAppPassword'
 
 export interface QueryParams {}
 
@@ -54,17 +56,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: 'com.atproto.server.createAppPassword#appPassword'
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
+export function validateAppPassword(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
+    `${id}#appPassword`,
     v,
-  )
+  ) as ValidationResult<AppPassword>
 }
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 426fb538fb3..1de3a275263 100644
--- a/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
+++ b/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.createInviteCode'
 
 export interface QueryParams {}
 
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 f7908697a21..8067cb1375b 100644
--- a/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.createInviteCodes'
 
 export interface QueryParams {}
 
@@ -44,17 +46,15 @@ export interface AccountCodes {
   [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+export function isAccountCodes(v: unknown): v is AccountCodes & {
+  $type: 'com.atproto.server.createInviteCodes#accountCodes'
+} {
+  return is$typed(v, id, 'accountCodes')
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
+export function validateAccountCodes(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
+    `${id}#accountCodes`,
     v,
-  )
+  ) as ValidationResult<AccountCodes>
 }
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 3ac1194b36d..e770328d143 100644
--- a/packages/api/src/client/types/com/atproto/server/createSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/createSession.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.createSession'
 
 export interface QueryParams {}
 
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 592380aa9cc..1f0fe6d594c 100644
--- a/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.deactivateAccount'
 
 export interface QueryParams {}
 
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 e6be3798909..1b5af7cb550 100644
--- a/packages/api/src/client/types/com/atproto/server/defs.ts
+++ b/packages/api/src/client/types/com/atproto/server/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
   code: string
@@ -17,16 +19,17 @@ export interface InviteCode {
   [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+export function isInviteCode(
+  v: unknown,
+): v is InviteCode & { $type: 'com.atproto.server.defs#inviteCode' } {
+  return is$typed(v, id, 'inviteCode')
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCode`,
+    v,
+  ) as ValidationResult<InviteCode>
 }
 
 export interface InviteCodeUse {
@@ -35,14 +38,15 @@ export interface InviteCodeUse {
   [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+export function isInviteCodeUse(
+  v: unknown,
+): v is InviteCodeUse & { $type: 'com.atproto.server.defs#inviteCodeUse' } {
+  return is$typed(v, id, 'inviteCodeUse')
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCodeUse`,
+    v,
+  ) as ValidationResult<InviteCodeUse>
 }
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 1e76ce2972f..14fa621644f 100644
--- a/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.deleteAccount'
 
 export interface QueryParams {}
 
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 dcab71e2558..cd15b29df81 100644
--- a/packages/api/src/client/types/com/atproto/server/deleteSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/deleteSession.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export 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 b2936e18125..877e524c77d 100644
--- a/packages/api/src/client/types/com/atproto/server/describeServer.ts
+++ b/packages/api/src/client/types/com/atproto/server/describeServer.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.describeServer'
 
 export interface QueryParams {}
 
@@ -45,16 +47,14 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: 'com.atproto.server.describeServer#links' } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
 
 export interface Contact {
@@ -62,14 +62,12 @@ export interface Contact {
   [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+export function isContact(
+  v: unknown,
+): v is Contact & { $type: 'com.atproto.server.describeServer#contact' } {
+  return is$typed(v, id, 'contact')
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact(v: unknown) {
+  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
 }
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 e6b688cea66..8459a28eb18 100644
--- a/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoServerDefs from './defs'
 
+export const id = 'com.atproto.server.getAccountInviteCodes'
+
 export interface QueryParams {
   includeUsed?: boolean
   /** Controls whether any new 'earned' but not 'created' invites should be created. */
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 41ea36e453e..7033411f538 100644
--- a/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.getServiceAuth'
 
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
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 1e0837924cc..145258c8c3e 100644
--- a/packages/api/src/client/types/com/atproto/server/getSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/getSession.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.getSession'
 
 export interface QueryParams {}
 
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 a6cf8dca707..6a7e4abb609 100644
--- a/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.listAppPasswords'
 
 export interface QueryParams {}
 
@@ -48,14 +50,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: 'com.atproto.server.listAppPasswords#appPassword'
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword(v: unknown) {
+  return lexicons.validate(
+    `${id}#appPassword`,
+    v,
+  ) as ValidationResult<AppPassword>
 }
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 24d0e9e0ccc..8ab1c3f6975 100644
--- a/packages/api/src/client/types/com/atproto/server/refreshSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/refreshSession.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.refreshSession'
 
 export interface QueryParams {}
 
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 dcab71e2558..de82e446400 100644
--- a/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export 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 dcab71e2558..2d16a280dea 100644
--- a/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export 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 1d51a212117..da5ff6b7c06 100644
--- a/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.requestEmailUpdate'
 
 export interface QueryParams {}
 
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 c33e4f4b604..5c627de4b30 100644
--- a/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.requestPasswordReset'
 
 export interface QueryParams {}
 
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 05867a62537..c2f6dfb1a21 100644
--- a/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.reserveSigningKey'
 
 export interface QueryParams {}
 
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 fb9f38e8e91..932c31c2711 100644
--- a/packages/api/src/client/types/com/atproto/server/resetPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/resetPassword.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.resetPassword'
 
 export interface QueryParams {}
 
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 2d77e055cb6..7daec677a17 100644
--- a/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.revokeAppPassword'
 
 export interface QueryParams {}
 
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 1213f63c724..70d32ad7e72 100644
--- a/packages/api/src/client/types/com/atproto/server/updateEmail.ts
+++ b/packages/api/src/client/types/com/atproto/server/updateEmail.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.server.updateEmail'
 
 export interface QueryParams {}
 
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 03318cf2fb0..3dc15913538 100644
--- a/packages/api/src/client/types/com/atproto/sync/getBlob.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getBlob.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.getBlob'
 
 export interface QueryParams {
   /** The DID of the account. */
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 20829a8075c..78cb91424af 100644
--- a/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.getBlocks'
 
 export interface QueryParams {
   /** The DID of the repo. */
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 86538474ed2..0844303b2ed 100644
--- a/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.getCheckout'
 
 export interface QueryParams {
   /** The DID of the repo. */
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 0f273053833..68983e50620 100644
--- a/packages/api/src/client/types/com/atproto/sync/getHead.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getHead.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.getHead'
 
 export interface QueryParams {
   /** The DID of the repo. */
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 b27f350430a..9d4726cd423 100644
--- a/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.getLatestCommit'
 
 export interface QueryParams {
   /** The DID of the repo. */
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 f88eb6ee70a..c8549a1abe2 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRecord.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRecord.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.getRecord'
 
 export interface QueryParams {
   /** The DID of the repo. */
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 52c43f7de93..7346b12aaf1 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRepo.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRepo.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.getRepo'
 
 export interface QueryParams {
   /** The DID of the repo. */
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 619d65eb558..a7195f6c1cf 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.getRepoStatus'
 
 export interface QueryParams {
   /** The DID of the repo. */
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 bf5a8f1f950..0c7e8936940 100644
--- a/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
+++ b/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.listBlobs'
 
 export interface QueryParams {
   /** The DID of the repo. */
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 84a44654f0b..7f9afe671a8 100644
--- a/packages/api/src/client/types/com/atproto/sync/listRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/listRepos.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.listRepos'
 
 export interface QueryParams {
   limit?: number
@@ -46,14 +48,12 @@ export interface Repo {
   [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+export function isRepo(
+  v: unknown,
+): v is Repo & { $type: 'com.atproto.sync.listRepos#repo' } {
+  return is$typed(v, id, 'repo')
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo(v: unknown) {
+  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
 }
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 30e24f8b5b9..393655874a2 100644
--- a/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.notifyOfUpdate'
 
 export interface QueryParams {}
 
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 0f5d78560cf..5c28bbb06da 100644
--- a/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.sync.requestCrawl'
 
 export interface QueryParams {}
 
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 eac07c9acc1..cd3fb8ceff4 100644
--- a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export 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 {
@@ -34,16 +36,14 @@ export interface Commit {
   [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+export function isCommit(
+  v: unknown,
+): v is Commit & { $type: 'com.atproto.sync.subscribeRepos#commit' } {
+  return is$typed(v, id, 'commit')
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit(v: unknown) {
+  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
 }
 
 /** 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. */
@@ -56,16 +56,14 @@ export interface Identity {
   [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+export function isIdentity(
+  v: unknown,
+): v is Identity & { $type: 'com.atproto.sync.subscribeRepos#identity' } {
+  return is$typed(v, id, 'identity')
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity(v: unknown) {
+  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
 }
 
 /** 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. */
@@ -80,16 +78,14 @@ export interface Account {
   [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+export function isAccount(
+  v: unknown,
+): v is Account & { $type: 'com.atproto.sync.subscribeRepos#account' } {
+  return is$typed(v, id, 'account')
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount(v: unknown) {
+  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
 }
 
 /** DEPRECATED -- Use #identity event instead */
@@ -101,16 +97,14 @@ export interface Handle {
   [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+export function isHandle(
+  v: unknown,
+): v is Handle & { $type: 'com.atproto.sync.subscribeRepos#handle' } {
+  return is$typed(v, id, 'handle')
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle(v: unknown) {
+  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -122,16 +116,14 @@ export interface Migrate {
   [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+export function isMigrate(
+  v: unknown,
+): v is Migrate & { $type: 'com.atproto.sync.subscribeRepos#migrate' } {
+  return is$typed(v, id, 'migrate')
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate(v: unknown) {
+  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -142,16 +134,14 @@ export interface Tombstone {
   [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+export function isTombstone(
+  v: unknown,
+): v is Tombstone & { $type: 'com.atproto.sync.subscribeRepos#tombstone' } {
+  return is$typed(v, id, 'tombstone')
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone(v: unknown) {
+  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
 }
 
 export interface Info {
@@ -160,16 +150,14 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: 'com.atproto.sync.subscribeRepos#info' } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
 
 /** A repo operation, ie a mutation of a single record. */
@@ -181,14 +169,12 @@ export interface RepoOp {
   [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+export function isRepoOp(
+  v: unknown,
+): v is RepoOp & { $type: 'com.atproto.sync.subscribeRepos#repoOp' } {
+  return is$typed(v, id, 'repoOp')
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp(v: unknown) {
+  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
 }
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 414e6ca565c..294a5878ca7 100644
--- a/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.temp.checkSignupQueue'
 
 export interface QueryParams {}
 
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 0b1d2399f4b..4be4ab04089 100644
--- a/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoLabelDefs from '../label/defs'
 
+export const id = 'com.atproto.temp.fetchLabels'
+
 export interface QueryParams {
   since?: number
   limit?: number
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 5e0699cd374..fefce382c43 100644
--- a/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'com.atproto.temp.requestPhoneVerification'
 
 export interface QueryParams {}
 
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 e7d22b33604..b6ca6279eb6 100644
--- a/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+export const id = 'tools.ozone.communication.createTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 4cf61252d7a..57f0a3b4265 100644
--- a/packages/api/src/client/types/tools/ozone/communication/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
   id: string
@@ -24,14 +26,15 @@ export interface TemplateView {
   [k: string]: unknown
 }
 
-export function isTemplateView(v: unknown): v is TemplateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.communication.defs#templateView'
-  )
+export function isTemplateView(v: unknown): v is TemplateView & {
+  $type: 'tools.ozone.communication.defs#templateView'
+} {
+  return is$typed(v, id, 'templateView')
 }
 
-export function validateTemplateView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.communication.defs#templateView', v)
+export function validateTemplateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#templateView`,
+    v,
+  ) as ValidationResult<TemplateView>
 }
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 0fc74571563..fa4f0f0161a 100644
--- a/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.communication.deleteTemplate'
 
 export interface QueryParams {}
 
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 c10f1ee56ba..064d83a237a 100644
--- a/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+export const id = 'tools.ozone.communication.listTemplates'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 5d6184ff5f4..cc7eee7b27f 100644
--- a/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+export const id = 'tools.ozone.communication.updateTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 022add54822..fabe6fd7bc5 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
@@ -12,6 +12,8 @@ import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
 import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'tools.ozone.moderation.defs'
+
 export interface ModEventView {
   id: number
   event:
@@ -47,16 +49,17 @@ export interface ModEventView {
   [k: string]: unknown
 }
 
-export function isModEventView(v: unknown): v is ModEventView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventView'
-  )
+export function isModEventView(
+  v: unknown,
+): v is ModEventView & { $type: 'tools.ozone.moderation.defs#modEventView' } {
+  return is$typed(v, id, 'modEventView')
 }
 
-export function validateModEventView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventView', v)
+export function validateModEventView(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventView`,
+    v,
+  ) as ValidationResult<ModEventView>
 }
 
 export interface ModEventViewDetail {
@@ -93,16 +96,17 @@ export interface ModEventViewDetail {
   [k: string]: unknown
 }
 
-export function isModEventViewDetail(v: unknown): v is ModEventViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventViewDetail'
-  )
+export function isModEventViewDetail(v: unknown): v is ModEventViewDetail & {
+  $type: 'tools.ozone.moderation.defs#modEventViewDetail'
+} {
+  return is$typed(v, id, 'modEventViewDetail')
 }
 
-export function validateModEventViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventViewDetail', v)
+export function validateModEventViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventViewDetail`,
+    v,
+  ) as ValidationResult<ModEventViewDetail>
 }
 
 export interface SubjectStatusView {
@@ -139,16 +143,17 @@ export interface SubjectStatusView {
   [k: string]: unknown
 }
 
-export function isSubjectStatusView(v: unknown): v is SubjectStatusView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#subjectStatusView'
-  )
+export function isSubjectStatusView(v: unknown): v is SubjectStatusView & {
+  $type: 'tools.ozone.moderation.defs#subjectStatusView'
+} {
+  return is$typed(v, id, 'subjectStatusView')
 }
 
-export function validateSubjectStatusView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
+export function validateSubjectStatusView(v: unknown) {
+  return lexicons.validate(
+    `${id}#subjectStatusView`,
+    v,
+  ) as ValidationResult<SubjectStatusView>
 }
 
 export type SubjectReviewState =
@@ -177,16 +182,17 @@ export interface ModEventTakedown {
   [k: string]: unknown
 }
 
-export function isModEventTakedown(v: unknown): v is ModEventTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTakedown'
-  )
+export function isModEventTakedown(v: unknown): v is ModEventTakedown & {
+  $type: 'tools.ozone.moderation.defs#modEventTakedown'
+} {
+  return is$typed(v, id, 'modEventTakedown')
 }
 
-export function validateModEventTakedown(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTakedown', v)
+export function validateModEventTakedown(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTakedown`,
+    v,
+  ) as ValidationResult<ModEventTakedown>
 }
 
 /** Revert take down action on a subject */
@@ -198,19 +204,17 @@ export interface ModEventReverseTakedown {
 
 export function isModEventReverseTakedown(
   v: unknown,
-): v is ModEventReverseTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReverseTakedown'
-  )
+): v is ModEventReverseTakedown & {
+  $type: 'tools.ozone.moderation.defs#modEventReverseTakedown'
+} {
+  return is$typed(v, id, 'modEventReverseTakedown')
 }
 
-export function validateModEventReverseTakedown(v: unknown): ValidationResult {
+export function validateModEventReverseTakedown(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventReverseTakedown',
+    `${id}#modEventReverseTakedown`,
     v,
-  )
+  ) as ValidationResult<ModEventReverseTakedown>
 }
 
 /** Resolve appeal on a subject */
@@ -222,19 +226,17 @@ export interface ModEventResolveAppeal {
 
 export function isModEventResolveAppeal(
   v: unknown,
-): v is ModEventResolveAppeal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventResolveAppeal'
-  )
+): v is ModEventResolveAppeal & {
+  $type: 'tools.ozone.moderation.defs#modEventResolveAppeal'
+} {
+  return is$typed(v, id, 'modEventResolveAppeal')
 }
 
-export function validateModEventResolveAppeal(v: unknown): ValidationResult {
+export function validateModEventResolveAppeal(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventResolveAppeal',
+    `${id}#modEventResolveAppeal`,
     v,
-  )
+  ) as ValidationResult<ModEventResolveAppeal>
 }
 
 /** Add a comment to a subject */
@@ -245,16 +247,17 @@ export interface ModEventComment {
   [k: string]: unknown
 }
 
-export function isModEventComment(v: unknown): v is ModEventComment {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventComment'
-  )
+export function isModEventComment(v: unknown): v is ModEventComment & {
+  $type: 'tools.ozone.moderation.defs#modEventComment'
+} {
+  return is$typed(v, id, 'modEventComment')
 }
 
-export function validateModEventComment(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventComment', v)
+export function validateModEventComment(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventComment`,
+    v,
+  ) as ValidationResult<ModEventComment>
 }
 
 /** Report a subject */
@@ -266,16 +269,17 @@ export interface ModEventReport {
   [k: string]: unknown
 }
 
-export function isModEventReport(v: unknown): v is ModEventReport {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReport'
-  )
+export function isModEventReport(v: unknown): v is ModEventReport & {
+  $type: 'tools.ozone.moderation.defs#modEventReport'
+} {
+  return is$typed(v, id, 'modEventReport')
 }
 
-export function validateModEventReport(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventReport', v)
+export function validateModEventReport(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventReport`,
+    v,
+  ) as ValidationResult<ModEventReport>
 }
 
 /** Apply/Negate labels on a subject */
@@ -286,16 +290,17 @@ export interface ModEventLabel {
   [k: string]: unknown
 }
 
-export function isModEventLabel(v: unknown): v is ModEventLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventLabel'
-  )
+export function isModEventLabel(
+  v: unknown,
+): v is ModEventLabel & { $type: 'tools.ozone.moderation.defs#modEventLabel' } {
+  return is$typed(v, id, 'modEventLabel')
 }
 
-export function validateModEventLabel(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
+export function validateModEventLabel(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventLabel`,
+    v,
+  ) as ValidationResult<ModEventLabel>
 }
 
 export interface ModEventAcknowledge {
@@ -303,16 +308,17 @@ export interface ModEventAcknowledge {
   [k: string]: unknown
 }
 
-export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventAcknowledge'
-  )
+export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge & {
+  $type: 'tools.ozone.moderation.defs#modEventAcknowledge'
+} {
+  return is$typed(v, id, 'modEventAcknowledge')
 }
 
-export function validateModEventAcknowledge(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventAcknowledge', v)
+export function validateModEventAcknowledge(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventAcknowledge`,
+    v,
+  ) as ValidationResult<ModEventAcknowledge>
 }
 
 export interface ModEventEscalate {
@@ -320,16 +326,17 @@ export interface ModEventEscalate {
   [k: string]: unknown
 }
 
-export function isModEventEscalate(v: unknown): v is ModEventEscalate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEscalate'
-  )
+export function isModEventEscalate(v: unknown): v is ModEventEscalate & {
+  $type: 'tools.ozone.moderation.defs#modEventEscalate'
+} {
+  return is$typed(v, id, 'modEventEscalate')
 }
 
-export function validateModEventEscalate(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEscalate', v)
+export function validateModEventEscalate(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEscalate`,
+    v,
+  ) as ValidationResult<ModEventEscalate>
 }
 
 /** Mute incoming reports on a subject */
@@ -340,16 +347,17 @@ export interface ModEventMute {
   [k: string]: unknown
 }
 
-export function isModEventMute(v: unknown): v is ModEventMute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMute'
-  )
+export function isModEventMute(
+  v: unknown,
+): v is ModEventMute & { $type: 'tools.ozone.moderation.defs#modEventMute' } {
+  return is$typed(v, id, 'modEventMute')
 }
 
-export function validateModEventMute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventMute', v)
+export function validateModEventMute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventMute`,
+    v,
+  ) as ValidationResult<ModEventMute>
 }
 
 /** Unmute action on a subject */
@@ -359,16 +367,17 @@ export interface ModEventUnmute {
   [k: string]: unknown
 }
 
-export function isModEventUnmute(v: unknown): v is ModEventUnmute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmute'
-  )
+export function isModEventUnmute(v: unknown): v is ModEventUnmute & {
+  $type: 'tools.ozone.moderation.defs#modEventUnmute'
+} {
+  return is$typed(v, id, 'modEventUnmute')
 }
 
-export function validateModEventUnmute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventUnmute', v)
+export function validateModEventUnmute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventUnmute`,
+    v,
+  ) as ValidationResult<ModEventUnmute>
 }
 
 /** Mute incoming reports from an account */
@@ -379,19 +388,19 @@ export interface ModEventMuteReporter {
   [k: string]: unknown
 }
 
-export function isModEventMuteReporter(v: unknown): v is ModEventMuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMuteReporter'
-  )
+export function isModEventMuteReporter(
+  v: unknown,
+): v is ModEventMuteReporter & {
+  $type: 'tools.ozone.moderation.defs#modEventMuteReporter'
+} {
+  return is$typed(v, id, 'modEventMuteReporter')
 }
 
-export function validateModEventMuteReporter(v: unknown): ValidationResult {
+export function validateModEventMuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventMuteReporter',
+    `${id}#modEventMuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventMuteReporter>
 }
 
 /** Unmute incoming reports from an account */
@@ -403,19 +412,17 @@ export interface ModEventUnmuteReporter {
 
 export function isModEventUnmuteReporter(
   v: unknown,
-): v is ModEventUnmuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmuteReporter'
-  )
+): v is ModEventUnmuteReporter & {
+  $type: 'tools.ozone.moderation.defs#modEventUnmuteReporter'
+} {
+  return is$typed(v, id, 'modEventUnmuteReporter')
 }
 
-export function validateModEventUnmuteReporter(v: unknown): ValidationResult {
+export function validateModEventUnmuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventUnmuteReporter',
+    `${id}#modEventUnmuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventUnmuteReporter>
 }
 
 /** Keep a log of outgoing email to a user */
@@ -429,16 +436,17 @@ export interface ModEventEmail {
   [k: string]: unknown
 }
 
-export function isModEventEmail(v: unknown): v is ModEventEmail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEmail'
-  )
+export function isModEventEmail(
+  v: unknown,
+): v is ModEventEmail & { $type: 'tools.ozone.moderation.defs#modEventEmail' } {
+  return is$typed(v, id, 'modEventEmail')
 }
 
-export function validateModEventEmail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEmail', v)
+export function validateModEventEmail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEmail`,
+    v,
+  ) as ValidationResult<ModEventEmail>
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
@@ -447,16 +455,17 @@ export interface ModEventDivert {
   [k: string]: unknown
 }
 
-export function isModEventDivert(v: unknown): v is ModEventDivert {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventDivert'
-  )
+export function isModEventDivert(v: unknown): v is ModEventDivert & {
+  $type: 'tools.ozone.moderation.defs#modEventDivert'
+} {
+  return is$typed(v, id, 'modEventDivert')
 }
 
-export function validateModEventDivert(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventDivert', v)
+export function validateModEventDivert(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventDivert`,
+    v,
+  ) as ValidationResult<ModEventDivert>
 }
 
 /** Add/Remove a tag on a subject */
@@ -470,16 +479,17 @@ export interface ModEventTag {
   [k: string]: unknown
 }
 
-export function isModEventTag(v: unknown): v is ModEventTag {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTag'
-  )
+export function isModEventTag(
+  v: unknown,
+): v is ModEventTag & { $type: 'tools.ozone.moderation.defs#modEventTag' } {
+  return is$typed(v, id, 'modEventTag')
 }
 
-export function validateModEventTag(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTag', v)
+export function validateModEventTag(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTag`,
+    v,
+  ) as ValidationResult<ModEventTag>
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -499,16 +509,17 @@ export interface AccountEvent {
   [k: string]: unknown
 }
 
-export function isAccountEvent(v: unknown): v is AccountEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountEvent'
-  )
+export function isAccountEvent(
+  v: unknown,
+): v is AccountEvent & { $type: 'tools.ozone.moderation.defs#accountEvent' } {
+  return is$typed(v, id, 'accountEvent')
 }
 
-export function validateAccountEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountEvent', v)
+export function validateAccountEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountEvent`,
+    v,
+  ) as ValidationResult<AccountEvent>
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -521,16 +532,17 @@ export interface IdentityEvent {
   [k: string]: unknown
 }
 
-export function isIdentityEvent(v: unknown): v is IdentityEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#identityEvent'
-  )
+export function isIdentityEvent(
+  v: unknown,
+): v is IdentityEvent & { $type: 'tools.ozone.moderation.defs#identityEvent' } {
+  return is$typed(v, id, 'identityEvent')
 }
 
-export function validateIdentityEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#identityEvent', v)
+export function validateIdentityEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#identityEvent`,
+    v,
+  ) as ValidationResult<IdentityEvent>
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -542,16 +554,17 @@ export interface RecordEvent {
   [k: string]: unknown
 }
 
-export function isRecordEvent(v: unknown): v is RecordEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordEvent'
-  )
+export function isRecordEvent(
+  v: unknown,
+): v is RecordEvent & { $type: 'tools.ozone.moderation.defs#recordEvent' } {
+  return is$typed(v, id, 'recordEvent')
 }
 
-export function validateRecordEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordEvent', v)
+export function validateRecordEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordEvent`,
+    v,
+  ) as ValidationResult<RecordEvent>
 }
 
 export interface RepoView {
@@ -569,16 +582,14 @@ export interface RepoView {
   [k: string]: unknown
 }
 
-export function isRepoView(v: unknown): v is RepoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoView'
-  )
+export function isRepoView(
+  v: unknown,
+): v is RepoView & { $type: 'tools.ozone.moderation.defs#repoView' } {
+  return is$typed(v, id, 'repoView')
 }
 
-export function validateRepoView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoView', v)
+export function validateRepoView(v: unknown) {
+  return lexicons.validate(`${id}#repoView`, v) as ValidationResult<RepoView>
 }
 
 export interface RepoViewDetail {
@@ -599,16 +610,17 @@ export interface RepoViewDetail {
   [k: string]: unknown
 }
 
-export function isRepoViewDetail(v: unknown): v is RepoViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewDetail'
-  )
+export function isRepoViewDetail(v: unknown): v is RepoViewDetail & {
+  $type: 'tools.ozone.moderation.defs#repoViewDetail'
+} {
+  return is$typed(v, id, 'repoViewDetail')
 }
 
-export function validateRepoViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewDetail', v)
+export function validateRepoViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewDetail`,
+    v,
+  ) as ValidationResult<RepoViewDetail>
 }
 
 export interface RepoViewNotFound {
@@ -616,16 +628,17 @@ export interface RepoViewNotFound {
   [k: string]: unknown
 }
 
-export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewNotFound'
-  )
+export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound & {
+  $type: 'tools.ozone.moderation.defs#repoViewNotFound'
+} {
+  return is$typed(v, id, 'repoViewNotFound')
 }
 
-export function validateRepoViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewNotFound', v)
+export function validateRepoViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewNotFound`,
+    v,
+  ) as ValidationResult<RepoViewNotFound>
 }
 
 export interface RecordView {
@@ -639,16 +652,17 @@ export interface RecordView {
   [k: string]: unknown
 }
 
-export function isRecordView(v: unknown): v is RecordView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordView'
-  )
+export function isRecordView(
+  v: unknown,
+): v is RecordView & { $type: 'tools.ozone.moderation.defs#recordView' } {
+  return is$typed(v, id, 'recordView')
 }
 
-export function validateRecordView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordView', v)
+export function validateRecordView(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordView`,
+    v,
+  ) as ValidationResult<RecordView>
 }
 
 export interface RecordViewDetail {
@@ -663,16 +677,17 @@ export interface RecordViewDetail {
   [k: string]: unknown
 }
 
-export function isRecordViewDetail(v: unknown): v is RecordViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewDetail'
-  )
+export function isRecordViewDetail(v: unknown): v is RecordViewDetail & {
+  $type: 'tools.ozone.moderation.defs#recordViewDetail'
+} {
+  return is$typed(v, id, 'recordViewDetail')
 }
 
-export function validateRecordViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewDetail', v)
+export function validateRecordViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewDetail`,
+    v,
+  ) as ValidationResult<RecordViewDetail>
 }
 
 export interface RecordViewNotFound {
@@ -680,16 +695,17 @@ export interface RecordViewNotFound {
   [k: string]: unknown
 }
 
-export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewNotFound'
-  )
+export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound & {
+  $type: 'tools.ozone.moderation.defs#recordViewNotFound'
+} {
+  return is$typed(v, id, 'recordViewNotFound')
 }
 
-export function validateRecordViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewNotFound', v)
+export function validateRecordViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewNotFound`,
+    v,
+  ) as ValidationResult<RecordViewNotFound>
 }
 
 export interface Moderation {
@@ -697,16 +713,17 @@ export interface Moderation {
   [k: string]: unknown
 }
 
-export function isModeration(v: unknown): v is Moderation {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderation'
-  )
+export function isModeration(
+  v: unknown,
+): v is Moderation & { $type: 'tools.ozone.moderation.defs#moderation' } {
+  return is$typed(v, id, 'moderation')
 }
 
-export function validateModeration(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderation', v)
+export function validateModeration(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderation`,
+    v,
+  ) as ValidationResult<Moderation>
 }
 
 export interface ModerationDetail {
@@ -714,16 +731,17 @@ export interface ModerationDetail {
   [k: string]: unknown
 }
 
-export function isModerationDetail(v: unknown): v is ModerationDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderationDetail'
-  )
+export function isModerationDetail(v: unknown): v is ModerationDetail & {
+  $type: 'tools.ozone.moderation.defs#moderationDetail'
+} {
+  return is$typed(v, id, 'moderationDetail')
 }
 
-export function validateModerationDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderationDetail', v)
+export function validateModerationDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderationDetail`,
+    v,
+  ) as ValidationResult<ModerationDetail>
 }
 
 export interface BlobView {
@@ -739,16 +757,14 @@ export interface BlobView {
   [k: string]: unknown
 }
 
-export function isBlobView(v: unknown): v is BlobView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#blobView'
-  )
+export function isBlobView(
+  v: unknown,
+): v is BlobView & { $type: 'tools.ozone.moderation.defs#blobView' } {
+  return is$typed(v, id, 'blobView')
 }
 
-export function validateBlobView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#blobView', v)
+export function validateBlobView(v: unknown) {
+  return lexicons.validate(`${id}#blobView`, v) as ValidationResult<BlobView>
 }
 
 export interface ImageDetails {
@@ -757,16 +773,17 @@ export interface ImageDetails {
   [k: string]: unknown
 }
 
-export function isImageDetails(v: unknown): v is ImageDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#imageDetails'
-  )
+export function isImageDetails(
+  v: unknown,
+): v is ImageDetails & { $type: 'tools.ozone.moderation.defs#imageDetails' } {
+  return is$typed(v, id, 'imageDetails')
 }
 
-export function validateImageDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#imageDetails', v)
+export function validateImageDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#imageDetails`,
+    v,
+  ) as ValidationResult<ImageDetails>
 }
 
 export interface VideoDetails {
@@ -776,16 +793,17 @@ export interface VideoDetails {
   [k: string]: unknown
 }
 
-export function isVideoDetails(v: unknown): v is VideoDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#videoDetails'
-  )
+export function isVideoDetails(
+  v: unknown,
+): v is VideoDetails & { $type: 'tools.ozone.moderation.defs#videoDetails' } {
+  return is$typed(v, id, 'videoDetails')
 }
 
-export function validateVideoDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#videoDetails', v)
+export function validateVideoDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#videoDetails`,
+    v,
+  ) as ValidationResult<VideoDetails>
 }
 
 export interface AccountHosting {
@@ -804,16 +822,17 @@ export interface AccountHosting {
   [k: string]: unknown
 }
 
-export function isAccountHosting(v: unknown): v is AccountHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountHosting'
-  )
+export function isAccountHosting(v: unknown): v is AccountHosting & {
+  $type: 'tools.ozone.moderation.defs#accountHosting'
+} {
+  return is$typed(v, id, 'accountHosting')
 }
 
-export function validateAccountHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountHosting', v)
+export function validateAccountHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountHosting`,
+    v,
+  ) as ValidationResult<AccountHosting>
 }
 
 export interface RecordHosting {
@@ -824,14 +843,15 @@ export interface RecordHosting {
   [k: string]: unknown
 }
 
-export function isRecordHosting(v: unknown): v is RecordHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordHosting'
-  )
+export function isRecordHosting(
+  v: unknown,
+): v is RecordHosting & { $type: 'tools.ozone.moderation.defs#recordHosting' } {
+  return is$typed(v, id, 'recordHosting')
 }
 
-export function validateRecordHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordHosting', v)
+export function validateRecordHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordHosting`,
+    v,
+  ) as ValidationResult<RecordHosting>
 }
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 56cf9279f0b..b7b2a91f70f 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
@@ -3,13 +3,15 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { 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'
 
+export const id = 'tools.ozone.moderation.emitEvent'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 7b1206d339f..61095265b40 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getEvent'
+
 export interface QueryParams {
   id: number
 }
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 fe1fc0b32c0..2ce2def6094 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRecord'
+
 export interface QueryParams {
   uri: string
   cid?: string
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 1d7b8d669b6..d929cb4b821 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRecords'
+
 export interface QueryParams {
   uris: string[]
 }
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 ce26b50acf1..a207a5b01d4 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRepo'
+
 export interface QueryParams {
   did: string
 }
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 17de1d06b35..0b3bafa7954 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRepos'
+
 export interface QueryParams {
   dids: string[]
 }
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 31cdf3d6c7d..9e92df75de9 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.queryEvents'
+
 export interface QueryParams {
   /** The types of events (fully qualified string in the format of tools.ozone.moderation.defs#modEvent<name>) to filter by. If not specified, all events are returned. */
   types?: string[]
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 2db3b9c0a60..02cc1417f70 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.queryStatuses'
+
 export interface QueryParams {
   /** All subjects, or subjects from given 'collections' param, belonging to the account specified in the 'subject' param will be returned. */
   includeAllUserRecords?: boolean
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 060b2b96331..9a1973c2ab5 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.searchRepos'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead */
   term?: string
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 d0127531450..167db7b966e 100644
--- a/packages/api/src/client/types/tools/ozone/server/getConfig.ts
+++ b/packages/api/src/client/types/tools/ozone/server/getConfig.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.server.getConfig'
 
 export interface QueryParams {}
 
@@ -40,16 +42,17 @@ export interface ServiceConfig {
   [k: string]: unknown
 }
 
-export function isServiceConfig(v: unknown): v is ServiceConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#serviceConfig'
-  )
+export function isServiceConfig(v: unknown): v is ServiceConfig & {
+  $type: 'tools.ozone.server.getConfig#serviceConfig'
+} {
+  return is$typed(v, id, 'serviceConfig')
 }
 
-export function validateServiceConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#serviceConfig', v)
+export function validateServiceConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#serviceConfig`,
+    v,
+  ) as ValidationResult<ServiceConfig>
 }
 
 export interface ViewerConfig {
@@ -61,14 +64,15 @@ export interface ViewerConfig {
   [k: string]: unknown
 }
 
-export function isViewerConfig(v: unknown): v is ViewerConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#viewerConfig'
-  )
+export function isViewerConfig(
+  v: unknown,
+): v is ViewerConfig & { $type: 'tools.ozone.server.getConfig#viewerConfig' } {
+  return is$typed(v, id, 'viewerConfig')
 }
 
-export function validateViewerConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#viewerConfig', v)
+export function validateViewerConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerConfig`,
+    v,
+  ) as ValidationResult<ViewerConfig>
 }
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 04379b2e5c3..3c02d06ca55 100644
--- a/packages/api/src/client/types/tools/ozone/set/addValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/addValues.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.set.addValues'
 
 export interface QueryParams {}
 
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 d6823eb9b84..ba41d90deca 100644
--- a/packages/api/src/client/types/tools/ozone/set/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/set/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.set.defs'
 
 export interface Set {
   name: string
@@ -12,14 +14,14 @@ export interface Set {
   [k: string]: unknown
 }
 
-export function isSet(v: unknown): v is Set {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'tools.ozone.set.defs#set'
-  )
+export function isSet(
+  v: unknown,
+): v is Set & { $type: 'tools.ozone.set.defs#set' } {
+  return is$typed(v, id, 'set')
 }
 
-export function validateSet(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#set', v)
+export function validateSet(v: unknown) {
+  return lexicons.validate(`${id}#set`, v) as ValidationResult<Set>
 }
 
 export interface SetView {
@@ -31,14 +33,12 @@ export interface SetView {
   [k: string]: unknown
 }
 
-export function isSetView(v: unknown): v is SetView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.set.defs#setView'
-  )
+export function isSetView(
+  v: unknown,
+): v is SetView & { $type: 'tools.ozone.set.defs#setView' } {
+  return is$typed(v, id, 'setView')
 }
 
-export function validateSetView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#setView', v)
+export function validateSetView(v: unknown) {
+  return lexicons.validate(`${id}#setView`, v) as ValidationResult<SetView>
 }
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 52988ca54c9..1181b7f21b3 100644
--- a/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
+++ b/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.set.deleteSet'
 
 export interface QueryParams {}
 
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 71845188b04..7672c65d9ae 100644
--- a/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.set.deleteValues'
 
 export interface QueryParams {}
 
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 e8b848a5ef7..7804f958d59 100644
--- a/packages/api/src/client/types/tools/ozone/set/getValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/getValues.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSetDefs from './defs'
 
+export const id = 'tools.ozone.set.getValues'
+
 export interface QueryParams {
   name: string
   limit?: number
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 dcb19d52890..c25222f0b85 100644
--- a/packages/api/src/client/types/tools/ozone/set/querySets.ts
+++ b/packages/api/src/client/types/tools/ozone/set/querySets.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSetDefs from './defs'
 
+export const id = 'tools.ozone.set.querySets'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 3489fe4cff1..20786dffcc1 100644
--- a/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
+++ b/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSetDefs from './defs'
 
+export const id = 'tools.ozone.set.upsertSet'
+
 export interface QueryParams {}
 
 export type InputSchema = ToolsOzoneSetDefs.Set
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 0193b78b811..6a961fdc12c 100644
--- a/packages/api/src/client/types/tools/ozone/setting/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.setting.defs'
 
 export interface Option {
   key: string
@@ -24,14 +26,12 @@ export interface Option {
   [k: string]: unknown
 }
 
-export function isOption(v: unknown): v is Option {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.setting.defs#option'
-  )
+export function isOption(
+  v: unknown,
+): v is Option & { $type: 'tools.ozone.setting.defs#option' } {
+  return is$typed(v, id, 'option')
 }
 
-export function validateOption(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.setting.defs#option', v)
+export function validateOption(v: unknown) {
+  return lexicons.validate(`${id}#option`, v) as ValidationResult<Option>
 }
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 d4a91230440..1d5ea5f6e0d 100644
--- a/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSettingDefs from './defs'
 
+export const id = 'tools.ozone.setting.listOptions'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 2073a3e298a..c3f7d289e54 100644
--- a/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.setting.removeOptions'
 
 export interface QueryParams {}
 
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 b37e2d790b5..78716b7b465 100644
--- a/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSettingDefs from './defs'
 
+export const id = 'tools.ozone.setting.upsertOption'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 1ab8f12a45b..46608e1d6ac 100644
--- a/packages/api/src/client/types/tools/ozone/signature/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
   property: string
@@ -12,14 +14,12 @@ export interface SigDetail {
   [k: string]: unknown
 }
 
-export function isSigDetail(v: unknown): v is SigDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.defs#sigDetail'
-  )
+export function isSigDetail(
+  v: unknown,
+): v is SigDetail & { $type: 'tools.ozone.signature.defs#sigDetail' } {
+  return is$typed(v, id, 'sigDetail')
 }
 
-export function validateSigDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.signature.defs#sigDetail', v)
+export function validateSigDetail(v: unknown) {
+  return lexicons.validate(`${id}#sigDetail`, v) as ValidationResult<SigDetail>
 }
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 f04a5c735d2..e5e000e40bd 100644
--- a/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+export const id = 'tools.ozone.signature.findCorrelation'
+
 export interface QueryParams {
   dids: string[]
 }
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 b817bbef60e..923d46a3e46 100644
--- a/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -3,12 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+export const id = 'tools.ozone.signature.findRelatedAccounts'
+
 export interface QueryParams {
   did: string
   cursor?: string
@@ -44,17 +46,15 @@ export interface RelatedAccount {
   [k: string]: unknown
 }
 
-export function isRelatedAccount(v: unknown): v is RelatedAccount {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
-  )
+export function isRelatedAccount(v: unknown): v is RelatedAccount & {
+  $type: 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
+} {
+  return is$typed(v, id, 'relatedAccount')
 }
 
-export function validateRelatedAccount(v: unknown): ValidationResult {
+export function validateRelatedAccount(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.signature.findRelatedAccounts#relatedAccount',
+    `${id}#relatedAccount`,
     v,
-  )
+  ) as ValidationResult<RelatedAccount>
 }
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 70e37b77458..274a037c889 100644
--- a/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 
+export const id = 'tools.ozone.signature.searchAccounts'
+
 export interface QueryParams {
   values: string[]
   cursor?: string
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 c323687ff0a..afe1904b4bf 100644
--- a/packages/api/src/client/types/tools/ozone/team/addMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/addMember.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneTeamDefs from './defs'
 
+export const id = 'tools.ozone.team.addMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 78fb7989264..679a5d57055 100644
--- a/packages/api/src/client/types/tools/ozone/team/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/team/defs.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 
+export const id = 'tools.ozone.team.defs'
+
 export interface Member {
   did: string
   disabled?: boolean
@@ -22,16 +24,14 @@ export interface Member {
   [k: string]: unknown
 }
 
-export function isMember(v: unknown): v is Member {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.team.defs#member'
-  )
+export function isMember(
+  v: unknown,
+): v is Member & { $type: 'tools.ozone.team.defs#member' } {
+  return is$typed(v, id, 'member')
 }
 
-export function validateMember(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.team.defs#member', v)
+export function validateMember(v: unknown) {
+  return lexicons.validate(`${id}#member`, v) as ValidationResult<Member>
 }
 
 /** 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 b456035e5d8..6b546123e34 100644
--- a/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+export const id = 'tools.ozone.team.deleteMember'
 
 export interface QueryParams {}
 
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 a0275d0e838..1fdaef709b8 100644
--- a/packages/api/src/client/types/tools/ozone/team/listMembers.ts
+++ b/packages/api/src/client/types/tools/ozone/team/listMembers.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneTeamDefs from './defs'
 
+export const id = 'tools.ozone.team.listMembers'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
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 71a96d12fa2..76b8cad5369 100644
--- a/packages/api/src/client/types/tools/ozone/team/updateMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/updateMember.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneTeamDefs from './defs'
 
+export const id = 'tools.ozone.team.updateMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/util.ts b/packages/api/src/client/util.ts
index d7e70440d6e..e76328e680e 100644
--- a/packages/api/src/client/util.ts
+++ b/packages/api/src/client/util.ts
@@ -1,13 +1,35 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+export type $Type<Id extends string, Hash extends string> =
+  | (Hash extends 'main' ? Id : never)
+  | `${Id}#${Hash}`
+
+function has$type<V>(v: V): v is V & object & { $type: unknown } {
+  return v != null && typeof v === 'object' && '$type' in v
+}
+
+function check$type<Id extends string, Hash extends string>(
+  $type: unknown,
+  id: Id,
+  hash: Hash,
+): $type is $Type<Id, Hash> {
+  return (
+    typeof $type === 'string' &&
+    ($type === id
+      ? hash === 'main'
+      : // $type === `${id}#${hash}`
+        $type.length === id.length + 1 + hash.length &&
+        $type[id.length] === '#' &&
+        $type.startsWith(id) &&
+        $type.endsWith(hash))
+  )
 }
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+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)
 }
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 97b51e14312..60f3c475a23 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
 
+export const id = 'app.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,16 +23,17 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(
+  v: unknown,
+): v is ProfileViewBasic & { $type: 'app.bsky.actor.defs#profileViewBasic' } {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
 
 export interface ProfileView {
@@ -47,16 +50,17 @@ export interface ProfileView {
   [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+export function isProfileView(
+  v: unknown,
+): v is ProfileView & { $type: 'app.bsky.actor.defs#profileView' } {
+  return is$typed(v, id, 'profileView')
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileView`,
+    v,
+  ) as ValidationResult<ProfileView>
 }
 
 export interface ProfileViewDetailed {
@@ -79,16 +83,17 @@ export interface ProfileViewDetailed {
   [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed & {
+  $type: 'app.bsky.actor.defs#profileViewDetailed'
+} {
+  return is$typed(v, id, 'profileViewDetailed')
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewDetailed`,
+    v,
+  ) as ValidationResult<ProfileViewDetailed>
 }
 
 export interface ProfileAssociated {
@@ -100,16 +105,17 @@ export interface ProfileAssociated {
   [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+export function isProfileAssociated(
+  v: unknown,
+): v is ProfileAssociated & { $type: 'app.bsky.actor.defs#profileAssociated' } {
+  return is$typed(v, id, 'profileAssociated')
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociated`,
+    v,
+  ) as ValidationResult<ProfileAssociated>
 }
 
 export interface ProfileAssociatedChat {
@@ -119,16 +125,17 @@ export interface ProfileAssociatedChat {
 
 export function isProfileAssociatedChat(
   v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+): v is ProfileAssociatedChat & {
+  $type: 'app.bsky.actor.defs#profileAssociatedChat'
+} {
+  return is$typed(v, id, 'profileAssociatedChat')
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociatedChat`,
+    v,
+  ) as ValidationResult<ProfileAssociatedChat>
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
@@ -144,16 +151,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: 'app.bsky.actor.defs#viewerState' } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 /** The subject's followers whom you also follow */
@@ -163,16 +171,17 @@ export interface KnownFollowers {
   [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+export function isKnownFollowers(
+  v: unknown,
+): v is KnownFollowers & { $type: 'app.bsky.actor.defs#knownFollowers' } {
+  return is$typed(v, id, 'knownFollowers')
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers(v: unknown) {
+  return lexicons.validate(
+    `${id}#knownFollowers`,
+    v,
+  ) as ValidationResult<KnownFollowers>
 }
 
 export type Preferences = (
@@ -196,16 +205,17 @@ export interface AdultContentPref {
   [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+export function isAdultContentPref(
+  v: unknown,
+): v is AdultContentPref & { $type: 'app.bsky.actor.defs#adultContentPref' } {
+  return is$typed(v, id, 'adultContentPref')
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#adultContentPref`,
+    v,
+  ) as ValidationResult<AdultContentPref>
 }
 
 export interface ContentLabelPref {
@@ -216,16 +226,17 @@ export interface ContentLabelPref {
   [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+export function isContentLabelPref(
+  v: unknown,
+): v is ContentLabelPref & { $type: 'app.bsky.actor.defs#contentLabelPref' } {
+  return is$typed(v, id, 'contentLabelPref')
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#contentLabelPref`,
+    v,
+  ) as ValidationResult<ContentLabelPref>
 }
 
 export interface SavedFeed {
@@ -236,16 +247,14 @@ export interface SavedFeed {
   [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+export function isSavedFeed(
+  v: unknown,
+): v is SavedFeed & { $type: 'app.bsky.actor.defs#savedFeed' } {
+  return is$typed(v, id, 'savedFeed')
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed(v: unknown) {
+  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
 }
 
 export interface SavedFeedsPrefV2 {
@@ -253,16 +262,17 @@ export interface SavedFeedsPrefV2 {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+export function isSavedFeedsPrefV2(
+  v: unknown,
+): v is SavedFeedsPrefV2 & { $type: 'app.bsky.actor.defs#savedFeedsPrefV2' } {
+  return is$typed(v, id, 'savedFeedsPrefV2')
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPrefV2`,
+    v,
+  ) as ValidationResult<SavedFeedsPrefV2>
 }
 
 export interface SavedFeedsPref {
@@ -272,16 +282,17 @@ export interface SavedFeedsPref {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+export function isSavedFeedsPref(
+  v: unknown,
+): v is SavedFeedsPref & { $type: 'app.bsky.actor.defs#savedFeedsPref' } {
+  return is$typed(v, id, 'savedFeedsPref')
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPref`,
+    v,
+  ) as ValidationResult<SavedFeedsPref>
 }
 
 export interface PersonalDetailsPref {
@@ -290,16 +301,17 @@ export interface PersonalDetailsPref {
   [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref & {
+  $type: 'app.bsky.actor.defs#personalDetailsPref'
+} {
+  return is$typed(v, id, 'personalDetailsPref')
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#personalDetailsPref`,
+    v,
+  ) as ValidationResult<PersonalDetailsPref>
 }
 
 export interface FeedViewPref {
@@ -318,16 +330,17 @@ export interface FeedViewPref {
   [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+export function isFeedViewPref(
+  v: unknown,
+): v is FeedViewPref & { $type: 'app.bsky.actor.defs#feedViewPref' } {
+  return is$typed(v, id, 'feedViewPref')
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPref`,
+    v,
+  ) as ValidationResult<FeedViewPref>
 }
 
 export interface ThreadViewPref {
@@ -338,16 +351,17 @@ export interface ThreadViewPref {
   [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+export function isThreadViewPref(
+  v: unknown,
+): v is ThreadViewPref & { $type: 'app.bsky.actor.defs#threadViewPref' } {
+  return is$typed(v, id, 'threadViewPref')
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPref`,
+    v,
+  ) as ValidationResult<ThreadViewPref>
 }
 
 export interface InterestsPref {
@@ -356,16 +370,17 @@ export interface InterestsPref {
   [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+export function isInterestsPref(
+  v: unknown,
+): v is InterestsPref & { $type: 'app.bsky.actor.defs#interestsPref' } {
+  return is$typed(v, id, 'interestsPref')
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#interestsPref`,
+    v,
+  ) as ValidationResult<InterestsPref>
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
@@ -384,16 +399,14 @@ export interface MutedWord {
   [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+export function isMutedWord(
+  v: unknown,
+): v is MutedWord & { $type: 'app.bsky.actor.defs#mutedWord' } {
+  return is$typed(v, id, 'mutedWord')
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord(v: unknown) {
+  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
 }
 
 export interface MutedWordsPref {
@@ -402,16 +415,17 @@ export interface MutedWordsPref {
   [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+export function isMutedWordsPref(
+  v: unknown,
+): v is MutedWordsPref & { $type: 'app.bsky.actor.defs#mutedWordsPref' } {
+  return is$typed(v, id, 'mutedWordsPref')
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#mutedWordsPref`,
+    v,
+  ) as ValidationResult<MutedWordsPref>
 }
 
 export interface HiddenPostsPref {
@@ -420,16 +434,17 @@ export interface HiddenPostsPref {
   [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+export function isHiddenPostsPref(
+  v: unknown,
+): v is HiddenPostsPref & { $type: 'app.bsky.actor.defs#hiddenPostsPref' } {
+  return is$typed(v, id, 'hiddenPostsPref')
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#hiddenPostsPref`,
+    v,
+  ) as ValidationResult<HiddenPostsPref>
 }
 
 export interface LabelersPref {
@@ -437,16 +452,17 @@ export interface LabelersPref {
   [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+export function isLabelersPref(
+  v: unknown,
+): v is LabelersPref & { $type: 'app.bsky.actor.defs#labelersPref' } {
+  return is$typed(v, id, 'labelersPref')
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelersPref`,
+    v,
+  ) as ValidationResult<LabelersPref>
 }
 
 export interface LabelerPrefItem {
@@ -454,16 +470,17 @@ export interface LabelerPrefItem {
   [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+export function isLabelerPrefItem(
+  v: unknown,
+): v is LabelerPrefItem & { $type: 'app.bsky.actor.defs#labelerPrefItem' } {
+  return is$typed(v, id, 'labelerPrefItem')
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPrefItem`,
+    v,
+  ) as ValidationResult<LabelerPrefItem>
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
@@ -476,16 +493,17 @@ export interface BskyAppStatePref {
   [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+export function isBskyAppStatePref(
+  v: unknown,
+): v is BskyAppStatePref & { $type: 'app.bsky.actor.defs#bskyAppStatePref' } {
+  return is$typed(v, id, 'bskyAppStatePref')
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppStatePref`,
+    v,
+  ) as ValidationResult<BskyAppStatePref>
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
@@ -494,16 +512,19 @@ export interface BskyAppProgressGuide {
   [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+export function isBskyAppProgressGuide(
+  v: unknown,
+): v is BskyAppProgressGuide & {
+  $type: 'app.bsky.actor.defs#bskyAppProgressGuide'
+} {
+  return is$typed(v, id, 'bskyAppProgressGuide')
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppProgressGuide`,
+    v,
+  ) as ValidationResult<BskyAppProgressGuide>
 }
 
 /** A new user experiences (NUX) storage object */
@@ -517,12 +538,12 @@ export interface Nux {
   [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+export function isNux(
+  v: unknown,
+): v is Nux & { $type: 'app.bsky.actor.defs#nux' } {
+  return is$typed(v, id, 'nux')
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux(v: unknown) {
+  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
 }
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 305e80484be..cbcb8d9d0b1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getPreferences'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 5a7b1f25bfc..816ff0aa928 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getProfile'
+
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
   actor: string
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 16438505654..d4d16137bab 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getProfiles'
+
 export interface QueryParams {
   actors: string[]
 }
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 33b89a18bfa..3e2eca1d6d9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getSuggestions'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 617bdf2cd73..16dd8c0af0d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.actor.profile'
+
 export interface Record {
   displayName?: string
   /** Free-form profile description text. */
@@ -25,15 +27,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.actor.profile#main' | 'app.bsky.actor.profile'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 670e752fea3..84ac22b7b70 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 dcda0c41854..c41d5dc325d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.searchActors'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
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 0198b23d790..976470008a5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.searchActorsTypeahead'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
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 cc253f9e610..643f349a328 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export 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 {
@@ -13,14 +15,15 @@ export interface AspectRatio {
   [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+export function isAspectRatio(
+  v: unknown,
+): v is AspectRatio & { $type: 'app.bsky.embed.defs#aspectRatio' } {
+  return is$typed(v, id, 'aspectRatio')
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio(v: unknown) {
+  return lexicons.validate(
+    `${id}#aspectRatio`,
+    v,
+  ) as ValidationResult<AspectRatio>
 }
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 b137ee4b6f5..57c16c40070 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export 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 {
@@ -12,17 +14,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.external#main' | 'app.bsky.embed.external'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface External {
@@ -33,16 +32,14 @@ export interface External {
   [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+export function isExternal(
+  v: unknown,
+): v is External & { $type: 'app.bsky.embed.external#external' } {
+  return is$typed(v, id, 'external')
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal(v: unknown) {
+  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
 }
 
 export interface View {
@@ -50,16 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.external#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewExternal {
@@ -70,14 +65,15 @@ export interface ViewExternal {
   [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+export function isViewExternal(
+  v: unknown,
+): v is ViewExternal & { $type: 'app.bsky.embed.external#viewExternal' } {
+  return is$typed(v, id, 'viewExternal')
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewExternal`,
+    v,
+  ) as ValidationResult<ViewExternal>
 }
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 1fddf42f8eb..fd605b3aa24 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
@@ -2,27 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+export const id = 'app.bsky.embed.images'
+
 export interface Main {
   images: Image[]
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.images#main' | 'app.bsky.embed.images'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Image {
@@ -33,14 +32,14 @@ export interface Image {
   [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+export function isImage(
+  v: unknown,
+): v is Image & { $type: 'app.bsky.embed.images#image' } {
+  return is$typed(v, id, 'image')
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage(v: unknown) {
+  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.images#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewImage {
@@ -69,14 +68,12 @@ export interface ViewImage {
   [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+export function isViewImage(
+  v: unknown,
+): v is ViewImage & { $type: 'app.bsky.embed.images#viewImage' } {
+  return is$typed(v, id, 'viewImage')
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage(v: unknown) {
+  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
 }
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 452c8fb7f71..a7a844f60e3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as AppBskyFeedDefs from '../feed/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
@@ -16,22 +16,21 @@ import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
 
+export const id = 'app.bsky.embed.record'
+
 export interface Main {
   record: ComAtprotoRepoStrongRef.Main
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.record#main' | 'app.bsky.embed.record'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.record#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewRecord {
@@ -81,16 +80,17 @@ export interface ViewRecord {
   [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+export function isViewRecord(
+  v: unknown,
+): v is ViewRecord & { $type: 'app.bsky.embed.record#viewRecord' } {
+  return is$typed(v, id, 'viewRecord')
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewRecord`,
+    v,
+  ) as ValidationResult<ViewRecord>
 }
 
 export interface ViewNotFound {
@@ -99,16 +99,17 @@ export interface ViewNotFound {
   [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+export function isViewNotFound(
+  v: unknown,
+): v is ViewNotFound & { $type: 'app.bsky.embed.record#viewNotFound' } {
+  return is$typed(v, id, 'viewNotFound')
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewNotFound`,
+    v,
+  ) as ValidationResult<ViewNotFound>
 }
 
 export interface ViewBlocked {
@@ -118,16 +119,17 @@ export interface ViewBlocked {
   [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+export function isViewBlocked(
+  v: unknown,
+): v is ViewBlocked & { $type: 'app.bsky.embed.record#viewBlocked' } {
+  return is$typed(v, id, 'viewBlocked')
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewBlocked`,
+    v,
+  ) as ValidationResult<ViewBlocked>
 }
 
 export interface ViewDetached {
@@ -136,14 +138,15 @@ export interface ViewDetached {
   [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+export function isViewDetached(
+  v: unknown,
+): v is ViewDetached & { $type: 'app.bsky.embed.record#viewDetached' } {
+  return is$typed(v, id, 'viewDetached')
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewDetached`,
+    v,
+  ) as ValidationResult<ViewDetached>
 }
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 4df0ee5c2d7..2e9783258ce 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyEmbedRecord from './record'
 import * as AppBskyEmbedImages from './images'
 import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 
+export const id = 'app.bsky.embed.recordWithMedia'
+
 export interface Main {
   record: AppBskyEmbedRecord.Main
   media:
@@ -20,17 +22,16 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type:
+    | 'app.bsky.embed.recordWithMedia#main'
+    | 'app.bsky.embed.recordWithMedia'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -43,14 +44,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.recordWithMedia#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
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 50eb59aa038..17221841473 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+export const id = 'app.bsky.embed.video'
+
 export interface Main {
   video: BlobRef
   captions?: Caption[]
@@ -16,17 +18,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: 'app.bsky.embed.video#main' | 'app.bsky.embed.video' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Caption {
@@ -35,16 +34,14 @@ export interface Caption {
   [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+export function isCaption(
+  v: unknown,
+): v is Caption & { $type: 'app.bsky.embed.video#caption' } {
+  return is$typed(v, id, 'caption')
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption(v: unknown) {
+  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
 }
 
 export interface View {
@@ -56,12 +53,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.video#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
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 1c6f6ce78f6..32090d73a08 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -15,6 +15,8 @@ import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyGraphDefs from '../graph/defs'
 
+export const id = 'app.bsky.feed.defs'
+
 export interface PostView {
   uri: string
   cid: string
@@ -38,14 +40,14 @@ export interface PostView {
   [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+export function isPostView(
+  v: unknown,
+): v is PostView & { $type: 'app.bsky.feed.defs#postView' } {
+  return is$typed(v, id, 'postView')
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView(v: unknown) {
+  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
@@ -59,16 +61,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: 'app.bsky.feed.defs#viewerState' } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 export interface FeedViewPost {
@@ -80,16 +83,17 @@ export interface FeedViewPost {
   [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+export function isFeedViewPost(
+  v: unknown,
+): v is FeedViewPost & { $type: 'app.bsky.feed.defs#feedViewPost' } {
+  return is$typed(v, id, 'feedViewPost')
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPost`,
+    v,
+  ) as ValidationResult<FeedViewPost>
 }
 
 export interface ReplyRef {
@@ -107,14 +111,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: 'app.bsky.feed.defs#replyRef' } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 export interface ReasonRepost {
@@ -123,32 +127,31 @@ export interface ReasonRepost {
   [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+export function isReasonRepost(
+  v: unknown,
+): v is ReasonRepost & { $type: 'app.bsky.feed.defs#reasonRepost' } {
+  return is$typed(v, id, 'reasonRepost')
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#reasonRepost`,
+    v,
+  ) as ValidationResult<ReasonRepost>
 }
 
 export interface ReasonPin {
   [k: string]: unknown
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+export function isReasonPin(
+  v: unknown,
+): v is ReasonPin & { $type: 'app.bsky.feed.defs#reasonPin' } {
+  return is$typed(v, id, 'reasonPin')
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin(v: unknown) {
+  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
 }
 
 export interface ThreadViewPost {
@@ -167,16 +170,17 @@ export interface ThreadViewPost {
   [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+export function isThreadViewPost(
+  v: unknown,
+): v is ThreadViewPost & { $type: 'app.bsky.feed.defs#threadViewPost' } {
+  return is$typed(v, id, 'threadViewPost')
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPost`,
+    v,
+  ) as ValidationResult<ThreadViewPost>
 }
 
 export interface NotFoundPost {
@@ -185,16 +189,17 @@ export interface NotFoundPost {
   [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+export function isNotFoundPost(
+  v: unknown,
+): v is NotFoundPost & { $type: 'app.bsky.feed.defs#notFoundPost' } {
+  return is$typed(v, id, 'notFoundPost')
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundPost`,
+    v,
+  ) as ValidationResult<NotFoundPost>
 }
 
 export interface BlockedPost {
@@ -204,16 +209,17 @@ export interface BlockedPost {
   [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+export function isBlockedPost(
+  v: unknown,
+): v is BlockedPost & { $type: 'app.bsky.feed.defs#blockedPost' } {
+  return is$typed(v, id, 'blockedPost')
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedPost`,
+    v,
+  ) as ValidationResult<BlockedPost>
 }
 
 export interface BlockedAuthor {
@@ -222,16 +228,17 @@ export interface BlockedAuthor {
   [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+export function isBlockedAuthor(
+  v: unknown,
+): v is BlockedAuthor & { $type: 'app.bsky.feed.defs#blockedAuthor' } {
+  return is$typed(v, id, 'blockedAuthor')
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedAuthor`,
+    v,
+  ) as ValidationResult<BlockedAuthor>
 }
 
 export interface GeneratorView {
@@ -251,16 +258,17 @@ export interface GeneratorView {
   [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+export function isGeneratorView(
+  v: unknown,
+): v is GeneratorView & { $type: 'app.bsky.feed.defs#generatorView' } {
+  return is$typed(v, id, 'generatorView')
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorView`,
+    v,
+  ) as ValidationResult<GeneratorView>
 }
 
 export interface GeneratorViewerState {
@@ -268,16 +276,19 @@ export interface GeneratorViewerState {
   [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+export function isGeneratorViewerState(
+  v: unknown,
+): v is GeneratorViewerState & {
+  $type: 'app.bsky.feed.defs#generatorViewerState'
+} {
+  return is$typed(v, id, 'generatorViewerState')
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorViewerState`,
+    v,
+  ) as ValidationResult<GeneratorViewerState>
 }
 
 export interface SkeletonFeedPost {
@@ -291,16 +302,17 @@ export interface SkeletonFeedPost {
   [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+export function isSkeletonFeedPost(
+  v: unknown,
+): v is SkeletonFeedPost & { $type: 'app.bsky.feed.defs#skeletonFeedPost' } {
+  return is$typed(v, id, 'skeletonFeedPost')
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonFeedPost`,
+    v,
+  ) as ValidationResult<SkeletonFeedPost>
 }
 
 export interface SkeletonReasonRepost {
@@ -308,32 +320,36 @@ export interface SkeletonReasonRepost {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+export function isSkeletonReasonRepost(
+  v: unknown,
+): v is SkeletonReasonRepost & {
+  $type: 'app.bsky.feed.defs#skeletonReasonRepost'
+} {
+  return is$typed(v, id, 'skeletonReasonRepost')
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonRepost`,
+    v,
+  ) as ValidationResult<SkeletonReasonRepost>
 }
 
 export interface SkeletonReasonPin {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+export function isSkeletonReasonPin(
+  v: unknown,
+): v is SkeletonReasonPin & { $type: 'app.bsky.feed.defs#skeletonReasonPin' } {
+  return is$typed(v, id, 'skeletonReasonPin')
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonPin`,
+    v,
+  ) as ValidationResult<SkeletonReasonPin>
 }
 
 export interface ThreadgateView {
@@ -344,16 +360,17 @@ export interface ThreadgateView {
   [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+export function isThreadgateView(
+  v: unknown,
+): v is ThreadgateView & { $type: 'app.bsky.feed.defs#threadgateView' } {
+  return is$typed(v, id, 'threadgateView')
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadgateView`,
+    v,
+  ) as ValidationResult<ThreadgateView>
 }
 
 export interface Interaction {
@@ -377,16 +394,17 @@ export interface Interaction {
   [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+export function isInteraction(
+  v: unknown,
+): v is Interaction & { $type: 'app.bsky.feed.defs#interaction' } {
+  return is$typed(v, id, 'interaction')
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction(v: unknown) {
+  return lexicons.validate(
+    `${id}#interaction`,
+    v,
+  ) as ValidationResult<Interaction>
 }
 
 /** 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 5bf8699a3ca..222200a6dab 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.feed.describeFeedGenerator'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,16 +51,14 @@ export interface Feed {
   [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+export function isFeed(
+  v: unknown,
+): v is Feed & { $type: 'app.bsky.feed.describeFeedGenerator#feed' } {
+  return is$typed(v, id, 'feed')
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed(v: unknown) {
+  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
 }
 
 export interface Links {
@@ -67,14 +67,12 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: 'app.bsky.feed.describeFeedGenerator#links' } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
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 eb8e8d0f633..9aff843de0d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.feed.generator'
+
 export interface Record {
   did: string
   displayName: string
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.generator#main' | 'app.bsky.feed.generator'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 0b8afff4ec8..43550105cca 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getActorFeeds'
+
 export interface QueryParams {
   actor: string
   limit: number
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 da315ae33c7..9c6ec1f722f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getActorLikes'
+
 export interface QueryParams {
   actor: string
   limit: number
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 60fa2f74f92..5dda0b3556b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getAuthorFeed'
+
 export interface QueryParams {
   actor: string
   limit: number
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 e03913a6fb3..1d38547b6a4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeed'
+
 export interface QueryParams {
   feed: string
   limit: number
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 7ab89057a8c..1388516ab39 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedGenerator'
+
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
   feed: string
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 21963a91e2e..085b4ddb346 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedGenerators'
+
 export interface QueryParams {
   feeds: string[]
 }
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 ca1cef20f08..861533a76b7 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedSkeleton'
+
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
   feed: string
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 275d99bba3d..dc21fc9d706 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.feed.getLikes'
+
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
   uri: string
@@ -60,12 +62,12 @@ export interface Like {
   [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+export function isLike(
+  v: unknown,
+): v is Like & { $type: 'app.bsky.feed.getLikes#like' } {
+  return is$typed(v, id, 'like')
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike(v: unknown) {
+  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
 }
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 84e12deaa92..d610b2bd573 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getListFeed'
+
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
   list: string
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 768977193ef..e82268ad2e6 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getPostThread'
+
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
   uri: string
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 85000c74787..709382d84fb 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getPosts'
+
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
   uris: string[]
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 38d04ad88c1..9f2bc12cd96 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getQuotes'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
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 40e008815d9..95976d204e3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.feed.getRepostedBy'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
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 d1ec590f33d..280d697a311 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getSuggestedFeeds'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 5202c9eb6e3..9a90195cc71 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getTimeline'
+
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
   algorithm?: string
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 1da9dd940dc..08180baa5a3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
@@ -2,25 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.like'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.feed.like#main' | 'app.bsky.feed.like' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 f9f2827c8d0..991ac71ccf2 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -14,6 +14,8 @@ import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.post'
+
 export interface Record {
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
@@ -41,16 +43,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.feed.post#main' | 'app.bsky.feed.post' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface ReplyRef {
@@ -59,14 +59,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: 'app.bsky.feed.post#replyRef' } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 /** Deprecated: use facets instead. */
@@ -78,14 +78,14 @@ export interface Entity {
   [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+export function isEntity(
+  v: unknown,
+): v is Entity & { $type: 'app.bsky.feed.post#entity' } {
+  return is$typed(v, id, 'entity')
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity(v: unknown) {
+  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
@@ -95,14 +95,12 @@ export interface TextSlice {
   [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+export function isTextSlice(
+  v: unknown,
+): v is TextSlice & { $type: 'app.bsky.feed.post#textSlice' } {
+  return is$typed(v, id, 'textSlice')
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice(v: unknown) {
+  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
 }
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 dcc4c22a425..4ea1cb11f7b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.feed.postgate'
 
 export interface Record {
   createdAt: string
@@ -16,17 +18,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.postgate#main' | 'app.bsky.feed.postgate'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Disables embedding of this post. */
@@ -34,14 +33,15 @@ export interface DisableRule {
   [k: string]: unknown
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+export function isDisableRule(
+  v: unknown,
+): v is DisableRule & { $type: 'app.bsky.feed.postgate#disableRule' } {
+  return is$typed(v, id, 'disableRule')
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#disableRule`,
+    v,
+  ) as ValidationResult<DisableRule>
 }
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 4c836d76e2a..5ee8fa1cdd8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
@@ -2,26 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.repost'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.repost#main' | 'app.bsky.feed.repost'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 14efa5276f8..68e6c2a887b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.searchPosts'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
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 c22fc1cb2fb..3ee83621222 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.sendInteractions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 c0e618c8f53..2de0434e1ad 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
   /** Reference (AT-URI) to the post record. */
@@ -21,17 +23,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.threadgate#main' | 'app.bsky.feed.threadgate'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Allow replies from actors mentioned in your post. */
@@ -39,16 +38,17 @@ export interface MentionRule {
   [k: string]: unknown
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+export function isMentionRule(
+  v: unknown,
+): v is MentionRule & { $type: 'app.bsky.feed.threadgate#mentionRule' } {
+  return is$typed(v, id, 'mentionRule')
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#mentionRule`,
+    v,
+  ) as ValidationResult<MentionRule>
 }
 
 /** Allow replies from actors you follow. */
@@ -56,16 +56,17 @@ export interface FollowingRule {
   [k: string]: unknown
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+export function isFollowingRule(
+  v: unknown,
+): v is FollowingRule & { $type: 'app.bsky.feed.threadgate#followingRule' } {
+  return is$typed(v, id, 'followingRule')
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#followingRule`,
+    v,
+  ) as ValidationResult<FollowingRule>
 }
 
 /** Allow replies from actors on a list. */
@@ -74,14 +75,12 @@ export interface ListRule {
   [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+export function isListRule(
+  v: unknown,
+): v is ListRule & { $type: 'app.bsky.feed.threadgate#listRule' } {
+  return is$typed(v, id, 'listRule')
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule(v: unknown) {
+  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
 }
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 b7f19f126b7..352cb6454ab 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.block'
 
 export interface Record {
   /** DID of the account to be blocked. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.block#main' | 'app.bsky.graph.block'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 63ecf7e00c0..8f4850ba863 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
 
+export const id = 'app.bsky.graph.defs'
+
 export interface ListViewBasic {
   uri: string
   cid: string
@@ -23,16 +25,17 @@ export interface ListViewBasic {
   [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+export function isListViewBasic(
+  v: unknown,
+): v is ListViewBasic & { $type: 'app.bsky.graph.defs#listViewBasic' } {
+  return is$typed(v, id, 'listViewBasic')
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewBasic`,
+    v,
+  ) as ValidationResult<ListViewBasic>
 }
 
 export interface ListView {
@@ -51,16 +54,14 @@ export interface ListView {
   [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+export function isListView(
+  v: unknown,
+): v is ListView & { $type: 'app.bsky.graph.defs#listView' } {
+  return is$typed(v, id, 'listView')
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView(v: unknown) {
+  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
 }
 
 export interface ListItemView {
@@ -69,16 +70,17 @@ export interface ListItemView {
   [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+export function isListItemView(
+  v: unknown,
+): v is ListItemView & { $type: 'app.bsky.graph.defs#listItemView' } {
+  return is$typed(v, id, 'listItemView')
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView(v: unknown) {
+  return lexicons.validate(
+    `${id}#listItemView`,
+    v,
+  ) as ValidationResult<ListItemView>
 }
 
 export interface StarterPackView {
@@ -96,16 +98,17 @@ export interface StarterPackView {
   [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+export function isStarterPackView(
+  v: unknown,
+): v is StarterPackView & { $type: 'app.bsky.graph.defs#starterPackView' } {
+  return is$typed(v, id, 'starterPackView')
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackView`,
+    v,
+  ) as ValidationResult<StarterPackView>
 }
 
 export interface StarterPackViewBasic {
@@ -121,16 +124,19 @@ export interface StarterPackViewBasic {
   [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+export function isStarterPackViewBasic(
+  v: unknown,
+): v is StarterPackViewBasic & {
+  $type: 'app.bsky.graph.defs#starterPackViewBasic'
+} {
+  return is$typed(v, id, 'starterPackViewBasic')
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackViewBasic`,
+    v,
+  ) as ValidationResult<StarterPackViewBasic>
 }
 
 export type ListPurpose =
@@ -152,16 +158,17 @@ export interface ListViewerState {
   [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+export function isListViewerState(
+  v: unknown,
+): v is ListViewerState & { $type: 'app.bsky.graph.defs#listViewerState' } {
+  return is$typed(v, id, 'listViewerState')
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewerState`,
+    v,
+  ) as ValidationResult<ListViewerState>
 }
 
 /** indicates that a handle or DID could not be resolved */
@@ -171,16 +178,17 @@ export interface NotFoundActor {
   [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+export function isNotFoundActor(
+  v: unknown,
+): v is NotFoundActor & { $type: 'app.bsky.graph.defs#notFoundActor' } {
+  return is$typed(v, id, 'notFoundActor')
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundActor`,
+    v,
+  ) as ValidationResult<NotFoundActor>
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
@@ -193,14 +201,15 @@ export interface Relationship {
   [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+export function isRelationship(
+  v: unknown,
+): v is Relationship & { $type: 'app.bsky.graph.defs#relationship' } {
+  return is$typed(v, id, 'relationship')
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship(v: unknown) {
+  return lexicons.validate(
+    `${id}#relationship`,
+    v,
+  ) as ValidationResult<Relationship>
 }
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 4b74a58a5df..62a91024b9d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.follow'
 
 export interface Record {
   subject: string
@@ -12,15 +14,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.follow#main' | 'app.bsky.graph.follow'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 10250d0f3b4..97e170748ba 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getActorStarterPacks'
+
 export interface QueryParams {
   actor: string
   limit: number
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 1fc9cd8ce37..897a5f4369b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 f5645eaef29..522f724a57b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
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 b9bd249da45..cd38a3ce0dc 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getFollows'
+
 export interface QueryParams {
   actor: string
   limit: number
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 f5645eaef29..f768f4641cb 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getKnownFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
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 864a81b3833..f2a28101921 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getList'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
   list: string
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 7399a14fadc..46f91ed6b70 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getListBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 7399a14fadc..e69a87f3949 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getListMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 dc0c4f18bea..f52261aab4b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getLists'
+
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
   actor: string
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 f450393522d..12cc1417996 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 bd6b6e765ed..e9e0cbe7941 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getRelationships'
+
 export interface QueryParams {
   /** Primary account requesting relationships for. */
   actor: string
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 93fe21f0b13..9a58898db30 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getStarterPack'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
   starterPack: string
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 4b9757b941e..55b817ec96e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getStarterPacks'
+
 export interface QueryParams {
   uris: string[]
 }
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 99b97e708f5..766f2ae2396 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getSuggestedFollowsByActor'
+
 export interface QueryParams {
   actor: string
 }
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 91c8ccee5bb..540745ff894 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyGraphDefs from './defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.graph.list'
+
 export interface Record {
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.graph.list#main' | 'app.bsky.graph.list' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 592778c7a51..0033adb86d8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.listblock'
 
 export interface Record {
   /** Reference (AT-URI) to the mod list record. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.listblock#main' | 'app.bsky.graph.listblock'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 5e93b34a111..c8b39c67071 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.listitem'
 
 export interface Record {
   /** The account which is included on the list. */
@@ -15,15 +17,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.listitem#main' | 'app.bsky.graph.listitem'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 baa9844046a..37bfa3a674e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.muteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6a68f680a1c..e741b3f2fc3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.muteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 928c56b6fc3..d8b89891f92 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.muteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 0daf8daf688..2029ef32d56 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 
+export const id = 'app.bsky.graph.starterpack'
+
 export interface Record {
   /** Display name for starter pack; can not be empty. */
   name: string
@@ -19,17 +21,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.starterpack#main' | 'app.bsky.graph.starterpack'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface FeedItem {
@@ -37,14 +36,12 @@ export interface FeedItem {
   [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+export function isFeedItem(
+  v: unknown,
+): v is FeedItem & { $type: 'app.bsky.graph.starterpack#feedItem' } {
+  return is$typed(v, id, 'feedItem')
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem(v: unknown) {
+  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
 }
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 baa9844046a..70155b11deb 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.unmuteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6a68f680a1c..a436151f54f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.unmuteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 928c56b6fc3..de6d5ba74d1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.unmuteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 e12c7203c57..e5e7aa2d9ba 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.labeler.defs'
+
 export interface LabelerView {
   uri: string
   cid: string
@@ -19,16 +21,17 @@ export interface LabelerView {
   [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+export function isLabelerView(
+  v: unknown,
+): v is LabelerView & { $type: 'app.bsky.labeler.defs#labelerView' } {
+  return is$typed(v, id, 'labelerView')
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerView`,
+    v,
+  ) as ValidationResult<LabelerView>
 }
 
 export interface LabelerViewDetailed {
@@ -43,16 +46,17 @@ export interface LabelerViewDetailed {
   [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed & {
+  $type: 'app.bsky.labeler.defs#labelerViewDetailed'
+} {
+  return is$typed(v, id, 'labelerViewDetailed')
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewDetailed`,
+    v,
+  ) as ValidationResult<LabelerViewDetailed>
 }
 
 export interface LabelerViewerState {
@@ -60,16 +64,17 @@ export interface LabelerViewerState {
   [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+export function isLabelerViewerState(v: unknown): v is LabelerViewerState & {
+  $type: 'app.bsky.labeler.defs#labelerViewerState'
+} {
+  return is$typed(v, id, 'labelerViewerState')
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewerState`,
+    v,
+  ) as ValidationResult<LabelerViewerState>
 }
 
 export interface LabelerPolicies {
@@ -80,14 +85,15 @@ export interface LabelerPolicies {
   [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+export function isLabelerPolicies(
+  v: unknown,
+): v is LabelerPolicies & { $type: 'app.bsky.labeler.defs#labelerPolicies' } {
+  return is$typed(v, id, 'labelerPolicies')
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPolicies`,
+    v,
+  ) as ValidationResult<LabelerPolicies>
 }
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 faeb30b4798..0f2e4e34509 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyLabelerDefs from './defs'
 
+export const id = 'app.bsky.labeler.getServices'
+
 export interface QueryParams {
   dids: string[]
   detailed: boolean
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 a044b8699b6..b510e8e58f5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyLabelerDefs from './defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.labeler.service'
+
 export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?:
@@ -17,15 +19,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.labeler.service#main' | 'app.bsky.labeler.service'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 3931e24d3f0..3d12fc24af9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.getUnreadCount'
+
 export interface QueryParams {
   priority?: boolean
   seenAt?: string
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 70adc412701..c930071b193 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.notification.listNotifications'
+
 export interface QueryParams {
   limit: number
   priority?: boolean
@@ -74,17 +76,15 @@ export interface Notification {
   [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+export function isNotification(v: unknown): v is Notification & {
+  $type: 'app.bsky.notification.listNotifications#notification'
+} {
+  return is$typed(v, id, 'notification')
 }
 
-export function validateNotification(v: unknown): ValidationResult {
+export function validateNotification(v: unknown) {
   return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
+    `${id}#notification`,
     v,
-  )
+  ) as ValidationResult<Notification>
 }
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 2c3a9d6fdbb..ef9b16d26ee 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 cce8f95839d..2a0596065a4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.registerPush'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 93db017a152..e83855b62b1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.updateSeen'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 139b5382caf..706ea4a3905 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
@@ -13,17 +15,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.richtext.facet#main' | 'app.bsky.richtext.facet'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
@@ -32,16 +31,14 @@ export interface Mention {
   [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+export function isMention(
+  v: unknown,
+): v is Mention & { $type: 'app.bsky.richtext.facet#mention' } {
+  return is$typed(v, id, 'mention')
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention(v: unknown) {
+  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
@@ -50,16 +47,14 @@ export interface Link {
   [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+export function isLink(
+  v: unknown,
+): v is Link & { $type: 'app.bsky.richtext.facet#link' } {
+  return is$typed(v, id, 'link')
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink(v: unknown) {
+  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
 }
 
 /** 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'). */
@@ -68,14 +63,14 @@ export interface Tag {
   [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+export function isTag(
+  v: unknown,
+): v is Tag & { $type: 'app.bsky.richtext.facet#tag' } {
+  return is$typed(v, id, 'tag')
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag(v: unknown) {
+  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
 }
 
 /** 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. */
@@ -85,14 +80,12 @@ export interface ByteSlice {
   [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+export function isByteSlice(
+  v: unknown,
+): v is ByteSlice & { $type: 'app.bsky.richtext.facet#byteSlice' } {
+  return is$typed(v, id, 'byteSlice')
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice(v: unknown) {
+  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
 }
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 59a6b38064c..980a3b50089 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
   uri: string
   [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost & {
+  $type: 'app.bsky.unspecced.defs#skeletonSearchPost'
+} {
+  return is$typed(v, id, 'skeletonSearchPost')
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchPost`,
+    v,
+  ) as ValidationResult<SkeletonSearchPost>
 }
 
 export interface SkeletonSearchActor {
@@ -28,14 +31,15 @@ export interface SkeletonSearchActor {
   [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor & {
+  $type: 'app.bsky.unspecced.defs#skeletonSearchActor'
+} {
+  return is$typed(v, id, 'skeletonSearchActor')
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchActor`,
+    v,
+  ) as ValidationResult<SkeletonSearchActor>
 }
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 da202ab0d54..b054827943a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.unspecced.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 02f19f3cc6a..bb5f5b19196 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+export const id = 'app.bsky.unspecced.getPopularFeedGenerators'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 b801fa34d72..7ec896318cb 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
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 a03f442140d..0e67f7c3a65 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.unspecced.getTaggedSuggestions'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,17 +51,15 @@ export interface Suggestion {
   [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+export function isSuggestion(v: unknown): v is Suggestion & {
+  $type: 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
+} {
+  return is$typed(v, id, 'suggestion')
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
+export function validateSuggestion(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
+    `${id}#suggestion`,
     v,
-  )
+  ) as ValidationResult<Suggestion>
 }
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 94295f45349..7e941e4dfa9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.searchActorsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
   q: string
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 cd293454902..01c6b678247 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.searchPostsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
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 12f4d674794..14d8d9ee41a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
   jobId: string
@@ -19,14 +21,12 @@ export interface JobStatus {
   [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+export function isJobStatus(
+  v: unknown,
+): v is JobStatus & { $type: 'app.bsky.video.defs#jobStatus' } {
+  return is$typed(v, id, 'jobStatus')
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus(v: unknown) {
+  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
 }
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 3e075ba2195..d2aac514ae9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+export const id = 'app.bsky.video.getJobStatus'
+
 export interface QueryParams {
   jobId: string
 }
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 f0f23003b0b..b769714371b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.video.getUploadLimits'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 c23ff677a4b..39c8b6c9ac4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -4,12 +4,14 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+export const id = 'app.bsky.video.uploadVideo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
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 b837351c1e1..6b4b30f1e0d 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'chat.bsky.actor.declaration#main' | 'chat.bsky.actor.declaration'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 8a05d480784..af004d93be9 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'chat.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,14 +23,15 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(
+  v: unknown,
+): v is ProfileViewBasic & { $type: 'chat.bsky.actor.defs#profileViewBasic' } {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
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 08714990fcb..753ea0d7e56 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.actor.deleteAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 f6f38ab2fb3..73b7bc7e050 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.actor.exportAccountData'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 b2452410be2..d56ce0dbbb5 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
 
+export const id = 'chat.bsky.convo.defs'
+
 export interface MessageRef {
   did: string
   convoId: string
@@ -16,16 +18,17 @@ export interface MessageRef {
   [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+export function isMessageRef(
+  v: unknown,
+): v is MessageRef & { $type: 'chat.bsky.convo.defs#messageRef' } {
+  return is$typed(v, id, 'messageRef')
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageRef`,
+    v,
+  ) as ValidationResult<MessageRef>
 }
 
 export interface MessageInput {
@@ -36,16 +39,17 @@ export interface MessageInput {
   [k: string]: unknown
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+export function isMessageInput(
+  v: unknown,
+): v is MessageInput & { $type: 'chat.bsky.convo.defs#messageInput' } {
+  return is$typed(v, id, 'messageInput')
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageInput`,
+    v,
+  ) as ValidationResult<MessageInput>
 }
 
 export interface MessageView {
@@ -60,16 +64,17 @@ export interface MessageView {
   [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+export function isMessageView(
+  v: unknown,
+): v is MessageView & { $type: 'chat.bsky.convo.defs#messageView' } {
+  return is$typed(v, id, 'messageView')
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageView`,
+    v,
+  ) as ValidationResult<MessageView>
 }
 
 export interface DeletedMessageView {
@@ -80,16 +85,17 @@ export interface DeletedMessageView {
   [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+export function isDeletedMessageView(v: unknown): v is DeletedMessageView & {
+  $type: 'chat.bsky.convo.defs#deletedMessageView'
+} {
+  return is$typed(v, id, 'deletedMessageView')
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#deletedMessageView`,
+    v,
+  ) as ValidationResult<DeletedMessageView>
 }
 
 export interface MessageViewSender {
@@ -97,16 +103,17 @@ export interface MessageViewSender {
   [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+export function isMessageViewSender(v: unknown): v is MessageViewSender & {
+  $type: 'chat.bsky.convo.defs#messageViewSender'
+} {
+  return is$typed(v, id, 'messageViewSender')
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageViewSender`,
+    v,
+  ) as ValidationResult<MessageViewSender>
 }
 
 export interface ConvoView {
@@ -123,16 +130,14 @@ export interface ConvoView {
   [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+export function isConvoView(
+  v: unknown,
+): v is ConvoView & { $type: 'chat.bsky.convo.defs#convoView' } {
+  return is$typed(v, id, 'convoView')
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView(v: unknown) {
+  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
 }
 
 export interface LogBeginConvo {
@@ -141,16 +146,17 @@ export interface LogBeginConvo {
   [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+export function isLogBeginConvo(
+  v: unknown,
+): v is LogBeginConvo & { $type: 'chat.bsky.convo.defs#logBeginConvo' } {
+  return is$typed(v, id, 'logBeginConvo')
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logBeginConvo`,
+    v,
+  ) as ValidationResult<LogBeginConvo>
 }
 
 export interface LogLeaveConvo {
@@ -159,16 +165,17 @@ export interface LogLeaveConvo {
   [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+export function isLogLeaveConvo(
+  v: unknown,
+): v is LogLeaveConvo & { $type: 'chat.bsky.convo.defs#logLeaveConvo' } {
+  return is$typed(v, id, 'logLeaveConvo')
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logLeaveConvo`,
+    v,
+  ) as ValidationResult<LogLeaveConvo>
 }
 
 export interface LogCreateMessage {
@@ -181,16 +188,17 @@ export interface LogCreateMessage {
   [k: string]: unknown
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+export function isLogCreateMessage(
+  v: unknown,
+): v is LogCreateMessage & { $type: 'chat.bsky.convo.defs#logCreateMessage' } {
+  return is$typed(v, id, 'logCreateMessage')
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logCreateMessage`,
+    v,
+  ) as ValidationResult<LogCreateMessage>
 }
 
 export interface LogDeleteMessage {
@@ -203,14 +211,15 @@ export interface LogDeleteMessage {
   [k: string]: unknown
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+export function isLogDeleteMessage(
+  v: unknown,
+): v is LogDeleteMessage & { $type: 'chat.bsky.convo.defs#logDeleteMessage' } {
+  return is$typed(v, id, 'logDeleteMessage')
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logDeleteMessage`,
+    v,
+  ) as ValidationResult<LogDeleteMessage>
 }
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 c05bc99b36a..ae3e904f1bd 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.deleteMessageForSelf'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 1448c75b306..06a188fb031 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getConvo'
+
 export interface QueryParams {
   convoId: string
 }
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 108dfd6ad5b..dfdfe34a722 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getConvoForMembers'
+
 export interface QueryParams {
   members: string[]
 }
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 89f6778c4d3..7e035a90201 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getLog'
+
 export interface QueryParams {
   cursor?: string
 }
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 a615ba37674..e5878ad980c 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getMessages'
+
 export interface QueryParams {
   convoId: string
   limit: number
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 8b76a7b0c75..086e4bf78e8 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.convo.leaveConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 4d6f35bf39c..b253dd9cfc1 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.listConvos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 ddb57623913..bf88be58357 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.muteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 ab2d8b03f89..da4d7a40828 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.sendMessage'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b3c2c2bc252..27d92c4bfcf 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.sendMessageBatch'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -55,14 +57,12 @@ export interface BatchItem {
   [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+export function isBatchItem(
+  v: unknown,
+): v is BatchItem & { $type: 'chat.bsky.convo.sendMessageBatch#batchItem' } {
+  return is$typed(v, id, 'batchItem')
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem(v: unknown) {
+  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
 }
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 ddb57623913..d8eb32a25a2 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.unmuteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b879cde82b0..d1a58113725 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.updateRead'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 077a0076bab..30842b4fc87 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.moderation.getActorMetadata'
+
 export interface QueryParams {
   actor: string
 }
@@ -54,14 +56,12 @@ export interface Metadata {
   [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+export function isMetadata(
+  v: unknown,
+): v is Metadata & { $type: 'chat.bsky.moderation.getActorMetadata#metadata' } {
+  return is$typed(v, id, 'metadata')
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata(v: unknown) {
+  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
 }
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 0a1f5b1b691..37358f83f28 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from '../convo/defs'
 
+export const id = 'chat.bsky.moderation.getMessageContext'
+
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
   convoId?: string
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 d9c95f69643..975584fea52 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.moderation.updateActorAccess'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 f58b7c7ece4..e428182996b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
@@ -2,27 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+export const id = 'com.atproto.admin.defs'
+
 export interface StatusAttr {
   applied: boolean
   ref?: string
   [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+export function isStatusAttr(
+  v: unknown,
+): v is StatusAttr & { $type: 'com.atproto.admin.defs#statusAttr' } {
+  return is$typed(v, id, 'statusAttr')
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr(v: unknown) {
+  return lexicons.validate(
+    `${id}#statusAttr`,
+    v,
+  ) as ValidationResult<StatusAttr>
 }
 
 export interface AccountView {
@@ -41,16 +44,17 @@ export interface AccountView {
   [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+export function isAccountView(
+  v: unknown,
+): v is AccountView & { $type: 'com.atproto.admin.defs#accountView' } {
+  return is$typed(v, id, 'accountView')
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountView`,
+    v,
+  ) as ValidationResult<AccountView>
 }
 
 export interface RepoRef {
@@ -58,16 +62,14 @@ export interface RepoRef {
   [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+export function isRepoRef(
+  v: unknown,
+): v is RepoRef & { $type: 'com.atproto.admin.defs#repoRef' } {
+  return is$typed(v, id, 'repoRef')
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef(v: unknown) {
+  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
 }
 
 export interface RepoBlobRef {
@@ -77,16 +79,17 @@ export interface RepoBlobRef {
   [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+export function isRepoBlobRef(
+  v: unknown,
+): v is RepoBlobRef & { $type: 'com.atproto.admin.defs#repoBlobRef' } {
+  return is$typed(v, id, 'repoBlobRef')
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoBlobRef`,
+    v,
+  ) as ValidationResult<RepoBlobRef>
 }
 
 export interface ThreatSignature {
@@ -95,14 +98,15 @@ export interface ThreatSignature {
   [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+export function isThreatSignature(
+  v: unknown,
+): v is ThreatSignature & { $type: 'com.atproto.admin.defs#threatSignature' } {
+  return is$typed(v, id, 'threatSignature')
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature(v: unknown) {
+  return lexicons.validate(
+    `${id}#threatSignature`,
+    v,
+  ) as ValidationResult<ThreatSignature>
 }
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 003c1b5ebcd..166e66e175f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 68c6503d95e..d9a061d7ebc 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.disableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 2bf8de35583..55e3ed71292 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.disableInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 3f2836e7142..912fc54e591 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.enableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 c7b840a153d..045b14e8b48 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.getAccountInfo'
+
 export interface QueryParams {
   did: string
 }
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 99ef44a99f5..332389f8dca 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.getAccountInfos'
+
 export interface QueryParams {
   dids: string[]
 }
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 d68b97d775a..9c59ba185a7 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+export const id = 'com.atproto.admin.getInviteCodes'
+
 export interface QueryParams {
   sort: 'recent' | 'usage' | (string & {})
   limit: number
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 c13496638c8..fbcdeb0016f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+export const id = 'com.atproto.admin.getSubjectStatus'
+
 export interface QueryParams {
   did?: string
   uri?: string
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 80d0eecd926..4c5354d87ed 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.searchAccounts'
+
 export interface QueryParams {
   email?: string
   cursor?: string
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 836fba39f79..a79f0942d87 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.sendEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 ebabffbccdb..552da287fa8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.updateAccountEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 d6dc4a2dc25..556625556dd 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.updateAccountHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 948568f0d3d..1cd4ae387a2 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.updateAccountPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 c03d9667cae..a27e65ef2b9 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+export const id = 'com.atproto.admin.updateSubjectStatus'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 5fa374de737..1e20823680f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.getRecommendedDidCredentials'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 82672f1d1c7..817075fd25a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.requestPlcOperationSignature'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 05019df6166..3fd5046e04a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.resolveHandle'
+
 export interface QueryParams {
   /** The handle to resolve. */
   handle: string
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 3c908c049f2..f349ce572dc 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.signPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 5290b55d023..788c8ce7b82 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.submitPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 f451d1f57c7..c68bb2b27e5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.updateHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 348e985622b..15f11ef9919 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
@@ -29,16 +31,14 @@ export interface Label {
   [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+export function isLabel(
+  v: unknown,
+): v is Label & { $type: 'com.atproto.label.defs#label' } {
+  return is$typed(v, id, 'label')
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel(v: unknown) {
+  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
@@ -47,16 +47,17 @@ export interface SelfLabels {
   [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+export function isSelfLabels(
+  v: unknown,
+): v is SelfLabels & { $type: 'com.atproto.label.defs#selfLabels' } {
+  return is$typed(v, id, 'selfLabels')
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels(v: unknown) {
+  return lexicons.validate(
+    `${id}#selfLabels`,
+    v,
+  ) as ValidationResult<SelfLabels>
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
@@ -66,16 +67,14 @@ export interface SelfLabel {
   [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+export function isSelfLabel(
+  v: unknown,
+): v is SelfLabel & { $type: 'com.atproto.label.defs#selfLabel' } {
+  return is$typed(v, id, 'selfLabel')
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel(v: unknown) {
+  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
@@ -94,16 +93,19 @@ export interface LabelValueDefinition {
   [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+export function isLabelValueDefinition(
+  v: unknown,
+): v is LabelValueDefinition & {
+  $type: 'com.atproto.label.defs#labelValueDefinition'
+} {
+  return is$typed(v, id, 'labelValueDefinition')
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelValueDefinition`,
+    v,
+  ) as ValidationResult<LabelValueDefinition>
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
@@ -119,21 +121,17 @@ export interface LabelValueDefinitionStrings {
 
 export function isLabelValueDefinitionStrings(
   v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+): v is LabelValueDefinitionStrings & {
+  $type: 'com.atproto.label.defs#labelValueDefinitionStrings'
+} {
+  return is$typed(v, id, 'labelValueDefinitionStrings')
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
+export function validateLabelValueDefinitionStrings(v: unknown) {
   return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+    `${id}#labelValueDefinitionStrings`,
     v,
-  )
+  ) as ValidationResult<LabelValueDefinitionStrings>
 }
 
 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 0c9d55a6961..aafadf6eb75 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from './defs'
 
+export const id = 'com.atproto.label.queryLabels'
+
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
   uriPatterns: string[]
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 6034b35d895..6d2b9fad745 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 import * as ComAtprotoLabelDefs from './defs'
 
+export const id = 'com.atproto.label.subscribeLabels'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -36,16 +38,14 @@ export interface Labels {
   [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+export function isLabels(
+  v: unknown,
+): v is Labels & { $type: 'com.atproto.label.subscribeLabels#labels' } {
+  return is$typed(v, id, 'labels')
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels(v: unknown) {
+  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
 }
 
 export interface Info {
@@ -54,14 +54,12 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: 'com.atproto.label.subscribeLabels#info' } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
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 aa3f810a91c..ac54e90ca42 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -3,14 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } 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'
 
+export const id = 'com.atproto.moderation.createReport'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 08e555c2422..cce51afac4a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
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 4e3c8dcef3d..a3c40d943f8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.applyWrites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -65,16 +67,14 @@ export interface Create {
   [k: string]: unknown
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+export function isCreate(
+  v: unknown,
+): v is Create & { $type: 'com.atproto.repo.applyWrites#create' } {
+  return is$typed(v, id, 'create')
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate(v: unknown) {
+  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
 }
 
 /** Operation which updates an existing record. */
@@ -85,16 +85,14 @@ export interface Update {
   [k: string]: unknown
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+export function isUpdate(
+  v: unknown,
+): v is Update & { $type: 'com.atproto.repo.applyWrites#update' } {
+  return is$typed(v, id, 'update')
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate(v: unknown) {
+  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
 }
 
 /** Operation which deletes an existing record. */
@@ -104,16 +102,14 @@ export interface Delete {
   [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+export function isDelete(
+  v: unknown,
+): v is Delete & { $type: 'com.atproto.repo.applyWrites#delete' } {
+  return is$typed(v, id, 'delete')
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete(v: unknown) {
+  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
 }
 
 export interface CreateResult {
@@ -123,16 +119,17 @@ export interface CreateResult {
   [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+export function isCreateResult(
+  v: unknown,
+): v is CreateResult & { $type: 'com.atproto.repo.applyWrites#createResult' } {
+  return is$typed(v, id, 'createResult')
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#createResult`,
+    v,
+  ) as ValidationResult<CreateResult>
 }
 
 export interface UpdateResult {
@@ -142,30 +139,32 @@ export interface UpdateResult {
   [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+export function isUpdateResult(
+  v: unknown,
+): v is UpdateResult & { $type: 'com.atproto.repo.applyWrites#updateResult' } {
+  return is$typed(v, id, 'updateResult')
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#updateResult`,
+    v,
+  ) as ValidationResult<UpdateResult>
 }
 
 export interface DeleteResult {
   [k: string]: unknown
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+export function isDeleteResult(
+  v: unknown,
+): v is DeleteResult & { $type: 'com.atproto.repo.applyWrites#deleteResult' } {
+  return is$typed(v, id, 'deleteResult')
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#deleteResult`,
+    v,
+  ) as ValidationResult<DeleteResult>
 }
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 5cac0848bf1..d48f93d5754 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.createRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 8357fe2a611..174e203464e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
   cid: string
@@ -12,14 +14,15 @@ export interface CommitMeta {
   [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+export function isCommitMeta(
+  v: unknown,
+): v is CommitMeta & { $type: 'com.atproto.repo.defs#commitMeta' } {
+  return is$typed(v, id, 'commitMeta')
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta(v: unknown) {
+  return lexicons.validate(
+    `${id}#commitMeta`,
+    v,
+  ) as ValidationResult<CommitMeta>
 }
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 e594cd00adf..76ee12900ac 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.deleteRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 749bedcfeb7..130f12e5414 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.describeRepo'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
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 9d03da19530..714c72a1a73 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.getRecord'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
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 59288c7a027..ce1308eefee 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.importRepo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
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 40f4d385e47..b5ee1a58803 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.listMissingBlobs'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -52,14 +54,15 @@ export interface RecordBlob {
   [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+export function isRecordBlob(
+  v: unknown,
+): v is RecordBlob & { $type: 'com.atproto.repo.listMissingBlobs#recordBlob' } {
+  return is$typed(v, id, 'recordBlob')
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordBlob`,
+    v,
+  ) as ValidationResult<RecordBlob>
 }
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 f46f6eb0f7f..f0f5239ab5e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.listRecords'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -64,14 +66,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'com.atproto.repo.listRecords#record' } {
+  return is$typed(v, id, 'record')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
 }
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 5cde768d7c2..dca58eb45a1 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.putRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 8b21a6ddf81..1bf0c9a4218 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
   uri: string
@@ -12,15 +14,12 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'com.atproto.repo.strongRef#main' | 'com.atproto.repo.strongRef'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
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 4a712346a0b..fd093015e5d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.uploadBlob'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
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 82672f1d1c7..47ff541186e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.activateAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 f17182a8dce..e6ba5dd7a5a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.checkAccountStatus'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 b667a04b996..5f45b6241e0 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.confirmEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6e9b2f9f3c2..6e46102755d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 00657a2058f..bcaa2d4f426 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -57,17 +59,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: 'com.atproto.server.createAppPassword#appPassword'
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
+export function validateAppPassword(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
+    `${id}#appPassword`,
     v,
-  )
+  ) as ValidationResult<AppPassword>
 }
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 9cfeacc7e28..4c7bdc68221 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createInviteCode'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 eb6cd2bb1b1..bf9207dbae9 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -56,17 +58,15 @@ export interface AccountCodes {
   [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+export function isAccountCodes(v: unknown): v is AccountCodes & {
+  $type: 'com.atproto.server.createInviteCodes#accountCodes'
+} {
+  return is$typed(v, id, 'accountCodes')
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
+export function validateAccountCodes(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
+    `${id}#accountCodes`,
     v,
-  )
+  ) as ValidationResult<AccountCodes>
 }
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 96f7d79d5bc..a4f9b4ea299 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createSession'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b3793d6b2e0..21fb1da53eb 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.deactivateAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 9bd67c9d7a5..69a456c9ebf 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
   code: string
@@ -17,16 +19,17 @@ export interface InviteCode {
   [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+export function isInviteCode(
+  v: unknown,
+): v is InviteCode & { $type: 'com.atproto.server.defs#inviteCode' } {
+  return is$typed(v, id, 'inviteCode')
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCode`,
+    v,
+  ) as ValidationResult<InviteCode>
 }
 
 export interface InviteCodeUse {
@@ -35,14 +38,15 @@ export interface InviteCodeUse {
   [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+export function isInviteCodeUse(
+  v: unknown,
+): v is InviteCodeUse & { $type: 'com.atproto.server.defs#inviteCodeUse' } {
+  return is$typed(v, id, 'inviteCodeUse')
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCodeUse`,
+    v,
+  ) as ValidationResult<InviteCodeUse>
 }
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 4fcec360a11..65e6c4b4d67 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 82672f1d1c7..54172a5b52f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.deleteSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 e21868158b3..bb2b13511cf 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.describeServer'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -56,16 +58,14 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: 'com.atproto.server.describeServer#links' } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
 
 export interface Contact {
@@ -73,14 +73,12 @@ export interface Contact {
   [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+export function isContact(
+  v: unknown,
+): v is Contact & { $type: 'com.atproto.server.describeServer#contact' } {
+  return is$typed(v, id, 'contact')
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact(v: unknown) {
+  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
 }
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 82c3ffa8c31..b2400f07631 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from './defs'
 
+export const id = 'com.atproto.server.getAccountInviteCodes'
+
 export interface QueryParams {
   includeUsed: boolean
   /** Controls whether any new 'earned' but not 'created' invites should be created. */
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 14f249fde44..87dd567bec1 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.getServiceAuth'
+
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
   aud: string
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 be34cb92afd..94c3063e409 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.getSession'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 397e7043e67..ce8a2b15722 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.listAppPasswords'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -50,14 +52,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: 'com.atproto.server.listAppPasswords#appPassword'
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword(v: unknown) {
+  return lexicons.validate(
+    `${id}#appPassword`,
+    v,
+  ) as ValidationResult<AppPassword>
 }
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 1d6272a0d71..0171f856e80 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.refreshSession'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 82672f1d1c7..147c1bef1ac 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestAccountDelete'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 82672f1d1c7..4ed07343349 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestEmailConfirmation'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 24dce3e12af..3da1fe9262b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestEmailUpdate'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 d0f3f2ad769..a89ba697b7b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestPasswordReset'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 0ec1e80c77c..59326f3d943 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.reserveSigningKey'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 38f63382cf0..e7b0fd81641 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.resetPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 769ad6aa521..849415e4a27 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.revokeAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 34fc7421979..692cfe6763d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.updateEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b1581d6e473..4cf3f512668 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getBlob'
+
 export interface QueryParams {
   /** The DID of the account. */
   did: string
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 925b4a7d50b..919d5867f6e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getBlocks'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 51856b9088d..62f07fd839b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getCheckout'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 adedd4cf211..f0f4a380c5e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getHead'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 f0e9a757d04..22a04bd1f8e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getLatestCommit'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 83d88655228..80ec16706f5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getRecord'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 883ff37def1..1790893b7a8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getRepo'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 00abbeaa84b..e0846692f81 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getRepoStatus'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 c6ea955ee0c..6372388b6dd 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.listBlobs'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 5628b0b5147..5074c8aa772 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.listRepos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -57,14 +59,12 @@ export interface Repo {
   [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+export function isRepo(
+  v: unknown,
+): v is Repo & { $type: 'com.atproto.sync.listRepos#repo' } {
+  return is$typed(v, id, 'repo')
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo(v: unknown) {
+  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
 }
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 8a0af577c7c..48c853fc46e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.notifyOfUpdate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 31180aabf58..44827aa5507 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.requestCrawl'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 8f9855a5da4..0e8194cc1e9 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 
+export const id = 'com.atproto.sync.subscribeRepos'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -61,16 +63,14 @@ export interface Commit {
   [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+export function isCommit(
+  v: unknown,
+): v is Commit & { $type: 'com.atproto.sync.subscribeRepos#commit' } {
+  return is$typed(v, id, 'commit')
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit(v: unknown) {
+  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
 }
 
 /** 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. */
@@ -83,16 +83,14 @@ export interface Identity {
   [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+export function isIdentity(
+  v: unknown,
+): v is Identity & { $type: 'com.atproto.sync.subscribeRepos#identity' } {
+  return is$typed(v, id, 'identity')
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity(v: unknown) {
+  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
 }
 
 /** 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. */
@@ -107,16 +105,14 @@ export interface Account {
   [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+export function isAccount(
+  v: unknown,
+): v is Account & { $type: 'com.atproto.sync.subscribeRepos#account' } {
+  return is$typed(v, id, 'account')
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount(v: unknown) {
+  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
 }
 
 /** DEPRECATED -- Use #identity event instead */
@@ -128,16 +124,14 @@ export interface Handle {
   [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+export function isHandle(
+  v: unknown,
+): v is Handle & { $type: 'com.atproto.sync.subscribeRepos#handle' } {
+  return is$typed(v, id, 'handle')
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle(v: unknown) {
+  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -149,16 +143,14 @@ export interface Migrate {
   [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+export function isMigrate(
+  v: unknown,
+): v is Migrate & { $type: 'com.atproto.sync.subscribeRepos#migrate' } {
+  return is$typed(v, id, 'migrate')
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate(v: unknown) {
+  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -169,16 +161,14 @@ export interface Tombstone {
   [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+export function isTombstone(
+  v: unknown,
+): v is Tombstone & { $type: 'com.atproto.sync.subscribeRepos#tombstone' } {
+  return is$typed(v, id, 'tombstone')
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone(v: unknown) {
+  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
 }
 
 export interface Info {
@@ -187,16 +177,14 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: 'com.atproto.sync.subscribeRepos#info' } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
 
 /** A repo operation, ie a mutation of a single record. */
@@ -208,14 +196,12 @@ export interface RepoOp {
   [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+export function isRepoOp(
+  v: unknown,
+): v is RepoOp & { $type: 'com.atproto.sync.subscribeRepos#repoOp' } {
+  return is$typed(v, id, 'repoOp')
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp(v: unknown) {
+  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
 }
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 9486bce2b2b..3fa4f04db56 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.temp.checkSignupQueue'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 0fbdeed1196..f52407cef2b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from '../label/defs'
 
+export const id = 'com.atproto.temp.fetchLabels'
+
 export interface QueryParams {
   since?: number
   limit: number
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 c977500fc33..c384b552934 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.temp.requestPhoneVerification'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/util.ts b/packages/bsky/src/lexicon/util.ts
index d7e70440d6e..e76328e680e 100644
--- a/packages/bsky/src/lexicon/util.ts
+++ b/packages/bsky/src/lexicon/util.ts
@@ -1,13 +1,35 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+export type $Type<Id extends string, Hash extends string> =
+  | (Hash extends 'main' ? Id : never)
+  | `${Id}#${Hash}`
+
+function has$type<V>(v: V): v is V & object & { $type: unknown } {
+  return v != null && typeof v === 'object' && '$type' in v
+}
+
+function check$type<Id extends string, Hash extends string>(
+  $type: unknown,
+  id: Id,
+  hash: Hash,
+): $type is $Type<Id, Hash> {
+  return (
+    typeof $type === 'string' &&
+    ($type === id
+      ? hash === 'main'
+      : // $type === `${id}#${hash}`
+        $type.length === id.length + 1 + hash.length &&
+        $type[id.length] === '#' &&
+        $type.startsWith(id) &&
+        $type.endsWith(hash))
+  )
 }
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+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)
 }
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 97b51e14312..60f3c475a23 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
 
+export const id = 'app.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,16 +23,17 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(
+  v: unknown,
+): v is ProfileViewBasic & { $type: 'app.bsky.actor.defs#profileViewBasic' } {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
 
 export interface ProfileView {
@@ -47,16 +50,17 @@ export interface ProfileView {
   [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+export function isProfileView(
+  v: unknown,
+): v is ProfileView & { $type: 'app.bsky.actor.defs#profileView' } {
+  return is$typed(v, id, 'profileView')
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileView`,
+    v,
+  ) as ValidationResult<ProfileView>
 }
 
 export interface ProfileViewDetailed {
@@ -79,16 +83,17 @@ export interface ProfileViewDetailed {
   [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed & {
+  $type: 'app.bsky.actor.defs#profileViewDetailed'
+} {
+  return is$typed(v, id, 'profileViewDetailed')
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewDetailed`,
+    v,
+  ) as ValidationResult<ProfileViewDetailed>
 }
 
 export interface ProfileAssociated {
@@ -100,16 +105,17 @@ export interface ProfileAssociated {
   [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+export function isProfileAssociated(
+  v: unknown,
+): v is ProfileAssociated & { $type: 'app.bsky.actor.defs#profileAssociated' } {
+  return is$typed(v, id, 'profileAssociated')
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociated`,
+    v,
+  ) as ValidationResult<ProfileAssociated>
 }
 
 export interface ProfileAssociatedChat {
@@ -119,16 +125,17 @@ export interface ProfileAssociatedChat {
 
 export function isProfileAssociatedChat(
   v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+): v is ProfileAssociatedChat & {
+  $type: 'app.bsky.actor.defs#profileAssociatedChat'
+} {
+  return is$typed(v, id, 'profileAssociatedChat')
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociatedChat`,
+    v,
+  ) as ValidationResult<ProfileAssociatedChat>
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
@@ -144,16 +151,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: 'app.bsky.actor.defs#viewerState' } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 /** The subject's followers whom you also follow */
@@ -163,16 +171,17 @@ export interface KnownFollowers {
   [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+export function isKnownFollowers(
+  v: unknown,
+): v is KnownFollowers & { $type: 'app.bsky.actor.defs#knownFollowers' } {
+  return is$typed(v, id, 'knownFollowers')
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers(v: unknown) {
+  return lexicons.validate(
+    `${id}#knownFollowers`,
+    v,
+  ) as ValidationResult<KnownFollowers>
 }
 
 export type Preferences = (
@@ -196,16 +205,17 @@ export interface AdultContentPref {
   [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+export function isAdultContentPref(
+  v: unknown,
+): v is AdultContentPref & { $type: 'app.bsky.actor.defs#adultContentPref' } {
+  return is$typed(v, id, 'adultContentPref')
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#adultContentPref`,
+    v,
+  ) as ValidationResult<AdultContentPref>
 }
 
 export interface ContentLabelPref {
@@ -216,16 +226,17 @@ export interface ContentLabelPref {
   [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+export function isContentLabelPref(
+  v: unknown,
+): v is ContentLabelPref & { $type: 'app.bsky.actor.defs#contentLabelPref' } {
+  return is$typed(v, id, 'contentLabelPref')
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#contentLabelPref`,
+    v,
+  ) as ValidationResult<ContentLabelPref>
 }
 
 export interface SavedFeed {
@@ -236,16 +247,14 @@ export interface SavedFeed {
   [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+export function isSavedFeed(
+  v: unknown,
+): v is SavedFeed & { $type: 'app.bsky.actor.defs#savedFeed' } {
+  return is$typed(v, id, 'savedFeed')
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed(v: unknown) {
+  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
 }
 
 export interface SavedFeedsPrefV2 {
@@ -253,16 +262,17 @@ export interface SavedFeedsPrefV2 {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+export function isSavedFeedsPrefV2(
+  v: unknown,
+): v is SavedFeedsPrefV2 & { $type: 'app.bsky.actor.defs#savedFeedsPrefV2' } {
+  return is$typed(v, id, 'savedFeedsPrefV2')
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPrefV2`,
+    v,
+  ) as ValidationResult<SavedFeedsPrefV2>
 }
 
 export interface SavedFeedsPref {
@@ -272,16 +282,17 @@ export interface SavedFeedsPref {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+export function isSavedFeedsPref(
+  v: unknown,
+): v is SavedFeedsPref & { $type: 'app.bsky.actor.defs#savedFeedsPref' } {
+  return is$typed(v, id, 'savedFeedsPref')
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPref`,
+    v,
+  ) as ValidationResult<SavedFeedsPref>
 }
 
 export interface PersonalDetailsPref {
@@ -290,16 +301,17 @@ export interface PersonalDetailsPref {
   [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref & {
+  $type: 'app.bsky.actor.defs#personalDetailsPref'
+} {
+  return is$typed(v, id, 'personalDetailsPref')
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#personalDetailsPref`,
+    v,
+  ) as ValidationResult<PersonalDetailsPref>
 }
 
 export interface FeedViewPref {
@@ -318,16 +330,17 @@ export interface FeedViewPref {
   [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+export function isFeedViewPref(
+  v: unknown,
+): v is FeedViewPref & { $type: 'app.bsky.actor.defs#feedViewPref' } {
+  return is$typed(v, id, 'feedViewPref')
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPref`,
+    v,
+  ) as ValidationResult<FeedViewPref>
 }
 
 export interface ThreadViewPref {
@@ -338,16 +351,17 @@ export interface ThreadViewPref {
   [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+export function isThreadViewPref(
+  v: unknown,
+): v is ThreadViewPref & { $type: 'app.bsky.actor.defs#threadViewPref' } {
+  return is$typed(v, id, 'threadViewPref')
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPref`,
+    v,
+  ) as ValidationResult<ThreadViewPref>
 }
 
 export interface InterestsPref {
@@ -356,16 +370,17 @@ export interface InterestsPref {
   [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+export function isInterestsPref(
+  v: unknown,
+): v is InterestsPref & { $type: 'app.bsky.actor.defs#interestsPref' } {
+  return is$typed(v, id, 'interestsPref')
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#interestsPref`,
+    v,
+  ) as ValidationResult<InterestsPref>
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
@@ -384,16 +399,14 @@ export interface MutedWord {
   [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+export function isMutedWord(
+  v: unknown,
+): v is MutedWord & { $type: 'app.bsky.actor.defs#mutedWord' } {
+  return is$typed(v, id, 'mutedWord')
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord(v: unknown) {
+  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
 }
 
 export interface MutedWordsPref {
@@ -402,16 +415,17 @@ export interface MutedWordsPref {
   [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+export function isMutedWordsPref(
+  v: unknown,
+): v is MutedWordsPref & { $type: 'app.bsky.actor.defs#mutedWordsPref' } {
+  return is$typed(v, id, 'mutedWordsPref')
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#mutedWordsPref`,
+    v,
+  ) as ValidationResult<MutedWordsPref>
 }
 
 export interface HiddenPostsPref {
@@ -420,16 +434,17 @@ export interface HiddenPostsPref {
   [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+export function isHiddenPostsPref(
+  v: unknown,
+): v is HiddenPostsPref & { $type: 'app.bsky.actor.defs#hiddenPostsPref' } {
+  return is$typed(v, id, 'hiddenPostsPref')
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#hiddenPostsPref`,
+    v,
+  ) as ValidationResult<HiddenPostsPref>
 }
 
 export interface LabelersPref {
@@ -437,16 +452,17 @@ export interface LabelersPref {
   [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+export function isLabelersPref(
+  v: unknown,
+): v is LabelersPref & { $type: 'app.bsky.actor.defs#labelersPref' } {
+  return is$typed(v, id, 'labelersPref')
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelersPref`,
+    v,
+  ) as ValidationResult<LabelersPref>
 }
 
 export interface LabelerPrefItem {
@@ -454,16 +470,17 @@ export interface LabelerPrefItem {
   [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+export function isLabelerPrefItem(
+  v: unknown,
+): v is LabelerPrefItem & { $type: 'app.bsky.actor.defs#labelerPrefItem' } {
+  return is$typed(v, id, 'labelerPrefItem')
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPrefItem`,
+    v,
+  ) as ValidationResult<LabelerPrefItem>
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
@@ -476,16 +493,17 @@ export interface BskyAppStatePref {
   [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+export function isBskyAppStatePref(
+  v: unknown,
+): v is BskyAppStatePref & { $type: 'app.bsky.actor.defs#bskyAppStatePref' } {
+  return is$typed(v, id, 'bskyAppStatePref')
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppStatePref`,
+    v,
+  ) as ValidationResult<BskyAppStatePref>
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
@@ -494,16 +512,19 @@ export interface BskyAppProgressGuide {
   [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+export function isBskyAppProgressGuide(
+  v: unknown,
+): v is BskyAppProgressGuide & {
+  $type: 'app.bsky.actor.defs#bskyAppProgressGuide'
+} {
+  return is$typed(v, id, 'bskyAppProgressGuide')
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppProgressGuide`,
+    v,
+  ) as ValidationResult<BskyAppProgressGuide>
 }
 
 /** A new user experiences (NUX) storage object */
@@ -517,12 +538,12 @@ export interface Nux {
   [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+export function isNux(
+  v: unknown,
+): v is Nux & { $type: 'app.bsky.actor.defs#nux' } {
+  return is$typed(v, id, 'nux')
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux(v: unknown) {
+  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
 }
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 305e80484be..cbcb8d9d0b1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getPreferences'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 5a7b1f25bfc..816ff0aa928 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getProfile'
+
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
   actor: string
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 16438505654..d4d16137bab 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getProfiles'
+
 export interface QueryParams {
   actors: string[]
 }
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 33b89a18bfa..3e2eca1d6d9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getSuggestions'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 617bdf2cd73..16dd8c0af0d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.actor.profile'
+
 export interface Record {
   displayName?: string
   /** Free-form profile description text. */
@@ -25,15 +27,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.actor.profile#main' | 'app.bsky.actor.profile'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 670e752fea3..84ac22b7b70 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 dcda0c41854..c41d5dc325d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.searchActors'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
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 0198b23d790..976470008a5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.searchActorsTypeahead'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
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 cc253f9e610..643f349a328 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export 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 {
@@ -13,14 +15,15 @@ export interface AspectRatio {
   [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+export function isAspectRatio(
+  v: unknown,
+): v is AspectRatio & { $type: 'app.bsky.embed.defs#aspectRatio' } {
+  return is$typed(v, id, 'aspectRatio')
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio(v: unknown) {
+  return lexicons.validate(
+    `${id}#aspectRatio`,
+    v,
+  ) as ValidationResult<AspectRatio>
 }
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 b137ee4b6f5..57c16c40070 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export 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 {
@@ -12,17 +14,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.external#main' | 'app.bsky.embed.external'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface External {
@@ -33,16 +32,14 @@ export interface External {
   [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+export function isExternal(
+  v: unknown,
+): v is External & { $type: 'app.bsky.embed.external#external' } {
+  return is$typed(v, id, 'external')
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal(v: unknown) {
+  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
 }
 
 export interface View {
@@ -50,16 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.external#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewExternal {
@@ -70,14 +65,15 @@ export interface ViewExternal {
   [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+export function isViewExternal(
+  v: unknown,
+): v is ViewExternal & { $type: 'app.bsky.embed.external#viewExternal' } {
+  return is$typed(v, id, 'viewExternal')
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewExternal`,
+    v,
+  ) as ValidationResult<ViewExternal>
 }
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 1fddf42f8eb..fd605b3aa24 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
@@ -2,27 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+export const id = 'app.bsky.embed.images'
+
 export interface Main {
   images: Image[]
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.images#main' | 'app.bsky.embed.images'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Image {
@@ -33,14 +32,14 @@ export interface Image {
   [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+export function isImage(
+  v: unknown,
+): v is Image & { $type: 'app.bsky.embed.images#image' } {
+  return is$typed(v, id, 'image')
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage(v: unknown) {
+  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.images#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewImage {
@@ -69,14 +68,12 @@ export interface ViewImage {
   [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+export function isViewImage(
+  v: unknown,
+): v is ViewImage & { $type: 'app.bsky.embed.images#viewImage' } {
+  return is$typed(v, id, 'viewImage')
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage(v: unknown) {
+  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
 }
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 452c8fb7f71..a7a844f60e3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as AppBskyFeedDefs from '../feed/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
@@ -16,22 +16,21 @@ import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
 
+export const id = 'app.bsky.embed.record'
+
 export interface Main {
   record: ComAtprotoRepoStrongRef.Main
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.record#main' | 'app.bsky.embed.record'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.record#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewRecord {
@@ -81,16 +80,17 @@ export interface ViewRecord {
   [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+export function isViewRecord(
+  v: unknown,
+): v is ViewRecord & { $type: 'app.bsky.embed.record#viewRecord' } {
+  return is$typed(v, id, 'viewRecord')
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewRecord`,
+    v,
+  ) as ValidationResult<ViewRecord>
 }
 
 export interface ViewNotFound {
@@ -99,16 +99,17 @@ export interface ViewNotFound {
   [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+export function isViewNotFound(
+  v: unknown,
+): v is ViewNotFound & { $type: 'app.bsky.embed.record#viewNotFound' } {
+  return is$typed(v, id, 'viewNotFound')
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewNotFound`,
+    v,
+  ) as ValidationResult<ViewNotFound>
 }
 
 export interface ViewBlocked {
@@ -118,16 +119,17 @@ export interface ViewBlocked {
   [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+export function isViewBlocked(
+  v: unknown,
+): v is ViewBlocked & { $type: 'app.bsky.embed.record#viewBlocked' } {
+  return is$typed(v, id, 'viewBlocked')
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewBlocked`,
+    v,
+  ) as ValidationResult<ViewBlocked>
 }
 
 export interface ViewDetached {
@@ -136,14 +138,15 @@ export interface ViewDetached {
   [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+export function isViewDetached(
+  v: unknown,
+): v is ViewDetached & { $type: 'app.bsky.embed.record#viewDetached' } {
+  return is$typed(v, id, 'viewDetached')
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewDetached`,
+    v,
+  ) as ValidationResult<ViewDetached>
 }
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 4df0ee5c2d7..2e9783258ce 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyEmbedRecord from './record'
 import * as AppBskyEmbedImages from './images'
 import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 
+export const id = 'app.bsky.embed.recordWithMedia'
+
 export interface Main {
   record: AppBskyEmbedRecord.Main
   media:
@@ -20,17 +22,16 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type:
+    | 'app.bsky.embed.recordWithMedia#main'
+    | 'app.bsky.embed.recordWithMedia'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -43,14 +44,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.recordWithMedia#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
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 50eb59aa038..17221841473 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+export const id = 'app.bsky.embed.video'
+
 export interface Main {
   video: BlobRef
   captions?: Caption[]
@@ -16,17 +18,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: 'app.bsky.embed.video#main' | 'app.bsky.embed.video' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Caption {
@@ -35,16 +34,14 @@ export interface Caption {
   [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+export function isCaption(
+  v: unknown,
+): v is Caption & { $type: 'app.bsky.embed.video#caption' } {
+  return is$typed(v, id, 'caption')
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption(v: unknown) {
+  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
 }
 
 export interface View {
@@ -56,12 +53,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.video#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
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 1c6f6ce78f6..32090d73a08 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -15,6 +15,8 @@ import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyGraphDefs from '../graph/defs'
 
+export const id = 'app.bsky.feed.defs'
+
 export interface PostView {
   uri: string
   cid: string
@@ -38,14 +40,14 @@ export interface PostView {
   [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+export function isPostView(
+  v: unknown,
+): v is PostView & { $type: 'app.bsky.feed.defs#postView' } {
+  return is$typed(v, id, 'postView')
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView(v: unknown) {
+  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
@@ -59,16 +61,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: 'app.bsky.feed.defs#viewerState' } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 export interface FeedViewPost {
@@ -80,16 +83,17 @@ export interface FeedViewPost {
   [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+export function isFeedViewPost(
+  v: unknown,
+): v is FeedViewPost & { $type: 'app.bsky.feed.defs#feedViewPost' } {
+  return is$typed(v, id, 'feedViewPost')
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPost`,
+    v,
+  ) as ValidationResult<FeedViewPost>
 }
 
 export interface ReplyRef {
@@ -107,14 +111,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: 'app.bsky.feed.defs#replyRef' } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 export interface ReasonRepost {
@@ -123,32 +127,31 @@ export interface ReasonRepost {
   [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+export function isReasonRepost(
+  v: unknown,
+): v is ReasonRepost & { $type: 'app.bsky.feed.defs#reasonRepost' } {
+  return is$typed(v, id, 'reasonRepost')
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#reasonRepost`,
+    v,
+  ) as ValidationResult<ReasonRepost>
 }
 
 export interface ReasonPin {
   [k: string]: unknown
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+export function isReasonPin(
+  v: unknown,
+): v is ReasonPin & { $type: 'app.bsky.feed.defs#reasonPin' } {
+  return is$typed(v, id, 'reasonPin')
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin(v: unknown) {
+  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
 }
 
 export interface ThreadViewPost {
@@ -167,16 +170,17 @@ export interface ThreadViewPost {
   [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+export function isThreadViewPost(
+  v: unknown,
+): v is ThreadViewPost & { $type: 'app.bsky.feed.defs#threadViewPost' } {
+  return is$typed(v, id, 'threadViewPost')
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPost`,
+    v,
+  ) as ValidationResult<ThreadViewPost>
 }
 
 export interface NotFoundPost {
@@ -185,16 +189,17 @@ export interface NotFoundPost {
   [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+export function isNotFoundPost(
+  v: unknown,
+): v is NotFoundPost & { $type: 'app.bsky.feed.defs#notFoundPost' } {
+  return is$typed(v, id, 'notFoundPost')
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundPost`,
+    v,
+  ) as ValidationResult<NotFoundPost>
 }
 
 export interface BlockedPost {
@@ -204,16 +209,17 @@ export interface BlockedPost {
   [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+export function isBlockedPost(
+  v: unknown,
+): v is BlockedPost & { $type: 'app.bsky.feed.defs#blockedPost' } {
+  return is$typed(v, id, 'blockedPost')
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedPost`,
+    v,
+  ) as ValidationResult<BlockedPost>
 }
 
 export interface BlockedAuthor {
@@ -222,16 +228,17 @@ export interface BlockedAuthor {
   [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+export function isBlockedAuthor(
+  v: unknown,
+): v is BlockedAuthor & { $type: 'app.bsky.feed.defs#blockedAuthor' } {
+  return is$typed(v, id, 'blockedAuthor')
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedAuthor`,
+    v,
+  ) as ValidationResult<BlockedAuthor>
 }
 
 export interface GeneratorView {
@@ -251,16 +258,17 @@ export interface GeneratorView {
   [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+export function isGeneratorView(
+  v: unknown,
+): v is GeneratorView & { $type: 'app.bsky.feed.defs#generatorView' } {
+  return is$typed(v, id, 'generatorView')
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorView`,
+    v,
+  ) as ValidationResult<GeneratorView>
 }
 
 export interface GeneratorViewerState {
@@ -268,16 +276,19 @@ export interface GeneratorViewerState {
   [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+export function isGeneratorViewerState(
+  v: unknown,
+): v is GeneratorViewerState & {
+  $type: 'app.bsky.feed.defs#generatorViewerState'
+} {
+  return is$typed(v, id, 'generatorViewerState')
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorViewerState`,
+    v,
+  ) as ValidationResult<GeneratorViewerState>
 }
 
 export interface SkeletonFeedPost {
@@ -291,16 +302,17 @@ export interface SkeletonFeedPost {
   [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+export function isSkeletonFeedPost(
+  v: unknown,
+): v is SkeletonFeedPost & { $type: 'app.bsky.feed.defs#skeletonFeedPost' } {
+  return is$typed(v, id, 'skeletonFeedPost')
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonFeedPost`,
+    v,
+  ) as ValidationResult<SkeletonFeedPost>
 }
 
 export interface SkeletonReasonRepost {
@@ -308,32 +320,36 @@ export interface SkeletonReasonRepost {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+export function isSkeletonReasonRepost(
+  v: unknown,
+): v is SkeletonReasonRepost & {
+  $type: 'app.bsky.feed.defs#skeletonReasonRepost'
+} {
+  return is$typed(v, id, 'skeletonReasonRepost')
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonRepost`,
+    v,
+  ) as ValidationResult<SkeletonReasonRepost>
 }
 
 export interface SkeletonReasonPin {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+export function isSkeletonReasonPin(
+  v: unknown,
+): v is SkeletonReasonPin & { $type: 'app.bsky.feed.defs#skeletonReasonPin' } {
+  return is$typed(v, id, 'skeletonReasonPin')
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonPin`,
+    v,
+  ) as ValidationResult<SkeletonReasonPin>
 }
 
 export interface ThreadgateView {
@@ -344,16 +360,17 @@ export interface ThreadgateView {
   [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+export function isThreadgateView(
+  v: unknown,
+): v is ThreadgateView & { $type: 'app.bsky.feed.defs#threadgateView' } {
+  return is$typed(v, id, 'threadgateView')
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadgateView`,
+    v,
+  ) as ValidationResult<ThreadgateView>
 }
 
 export interface Interaction {
@@ -377,16 +394,17 @@ export interface Interaction {
   [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+export function isInteraction(
+  v: unknown,
+): v is Interaction & { $type: 'app.bsky.feed.defs#interaction' } {
+  return is$typed(v, id, 'interaction')
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction(v: unknown) {
+  return lexicons.validate(
+    `${id}#interaction`,
+    v,
+  ) as ValidationResult<Interaction>
 }
 
 /** 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 5bf8699a3ca..222200a6dab 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.feed.describeFeedGenerator'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,16 +51,14 @@ export interface Feed {
   [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+export function isFeed(
+  v: unknown,
+): v is Feed & { $type: 'app.bsky.feed.describeFeedGenerator#feed' } {
+  return is$typed(v, id, 'feed')
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed(v: unknown) {
+  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
 }
 
 export interface Links {
@@ -67,14 +67,12 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: 'app.bsky.feed.describeFeedGenerator#links' } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
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 eb8e8d0f633..9aff843de0d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.feed.generator'
+
 export interface Record {
   did: string
   displayName: string
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.generator#main' | 'app.bsky.feed.generator'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 0b8afff4ec8..43550105cca 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getActorFeeds'
+
 export interface QueryParams {
   actor: string
   limit: number
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 da315ae33c7..9c6ec1f722f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getActorLikes'
+
 export interface QueryParams {
   actor: string
   limit: number
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 60fa2f74f92..5dda0b3556b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getAuthorFeed'
+
 export interface QueryParams {
   actor: string
   limit: number
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 e03913a6fb3..1d38547b6a4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeed'
+
 export interface QueryParams {
   feed: string
   limit: number
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 7ab89057a8c..1388516ab39 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedGenerator'
+
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
   feed: string
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 21963a91e2e..085b4ddb346 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedGenerators'
+
 export interface QueryParams {
   feeds: string[]
 }
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 ca1cef20f08..861533a76b7 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedSkeleton'
+
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
   feed: string
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 275d99bba3d..dc21fc9d706 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.feed.getLikes'
+
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
   uri: string
@@ -60,12 +62,12 @@ export interface Like {
   [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+export function isLike(
+  v: unknown,
+): v is Like & { $type: 'app.bsky.feed.getLikes#like' } {
+  return is$typed(v, id, 'like')
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike(v: unknown) {
+  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
 }
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 84e12deaa92..d610b2bd573 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getListFeed'
+
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
   list: string
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 768977193ef..e82268ad2e6 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getPostThread'
+
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
   uri: string
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 85000c74787..709382d84fb 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getPosts'
+
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
   uris: string[]
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 38d04ad88c1..9f2bc12cd96 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getQuotes'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
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 40e008815d9..95976d204e3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.feed.getRepostedBy'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
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 d1ec590f33d..280d697a311 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getSuggestedFeeds'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 5202c9eb6e3..9a90195cc71 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getTimeline'
+
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
   algorithm?: string
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 1da9dd940dc..08180baa5a3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
@@ -2,25 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.like'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.feed.like#main' | 'app.bsky.feed.like' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 f9f2827c8d0..991ac71ccf2 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -14,6 +14,8 @@ import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.post'
+
 export interface Record {
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
@@ -41,16 +43,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.feed.post#main' | 'app.bsky.feed.post' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface ReplyRef {
@@ -59,14 +59,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: 'app.bsky.feed.post#replyRef' } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 /** Deprecated: use facets instead. */
@@ -78,14 +78,14 @@ export interface Entity {
   [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+export function isEntity(
+  v: unknown,
+): v is Entity & { $type: 'app.bsky.feed.post#entity' } {
+  return is$typed(v, id, 'entity')
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity(v: unknown) {
+  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
@@ -95,14 +95,12 @@ export interface TextSlice {
   [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+export function isTextSlice(
+  v: unknown,
+): v is TextSlice & { $type: 'app.bsky.feed.post#textSlice' } {
+  return is$typed(v, id, 'textSlice')
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice(v: unknown) {
+  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
 }
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 dcc4c22a425..4ea1cb11f7b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.feed.postgate'
 
 export interface Record {
   createdAt: string
@@ -16,17 +18,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.postgate#main' | 'app.bsky.feed.postgate'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Disables embedding of this post. */
@@ -34,14 +33,15 @@ export interface DisableRule {
   [k: string]: unknown
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+export function isDisableRule(
+  v: unknown,
+): v is DisableRule & { $type: 'app.bsky.feed.postgate#disableRule' } {
+  return is$typed(v, id, 'disableRule')
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#disableRule`,
+    v,
+  ) as ValidationResult<DisableRule>
 }
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 4c836d76e2a..5ee8fa1cdd8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
@@ -2,26 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.repost'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.repost#main' | 'app.bsky.feed.repost'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 14efa5276f8..68e6c2a887b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.searchPosts'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
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 c22fc1cb2fb..3ee83621222 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.sendInteractions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 c0e618c8f53..2de0434e1ad 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
   /** Reference (AT-URI) to the post record. */
@@ -21,17 +23,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.threadgate#main' | 'app.bsky.feed.threadgate'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Allow replies from actors mentioned in your post. */
@@ -39,16 +38,17 @@ export interface MentionRule {
   [k: string]: unknown
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+export function isMentionRule(
+  v: unknown,
+): v is MentionRule & { $type: 'app.bsky.feed.threadgate#mentionRule' } {
+  return is$typed(v, id, 'mentionRule')
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#mentionRule`,
+    v,
+  ) as ValidationResult<MentionRule>
 }
 
 /** Allow replies from actors you follow. */
@@ -56,16 +56,17 @@ export interface FollowingRule {
   [k: string]: unknown
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+export function isFollowingRule(
+  v: unknown,
+): v is FollowingRule & { $type: 'app.bsky.feed.threadgate#followingRule' } {
+  return is$typed(v, id, 'followingRule')
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#followingRule`,
+    v,
+  ) as ValidationResult<FollowingRule>
 }
 
 /** Allow replies from actors on a list. */
@@ -74,14 +75,12 @@ export interface ListRule {
   [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+export function isListRule(
+  v: unknown,
+): v is ListRule & { $type: 'app.bsky.feed.threadgate#listRule' } {
+  return is$typed(v, id, 'listRule')
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule(v: unknown) {
+  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
 }
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 b7f19f126b7..352cb6454ab 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.block'
 
 export interface Record {
   /** DID of the account to be blocked. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.block#main' | 'app.bsky.graph.block'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 63ecf7e00c0..8f4850ba863 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
 
+export const id = 'app.bsky.graph.defs'
+
 export interface ListViewBasic {
   uri: string
   cid: string
@@ -23,16 +25,17 @@ export interface ListViewBasic {
   [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+export function isListViewBasic(
+  v: unknown,
+): v is ListViewBasic & { $type: 'app.bsky.graph.defs#listViewBasic' } {
+  return is$typed(v, id, 'listViewBasic')
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewBasic`,
+    v,
+  ) as ValidationResult<ListViewBasic>
 }
 
 export interface ListView {
@@ -51,16 +54,14 @@ export interface ListView {
   [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+export function isListView(
+  v: unknown,
+): v is ListView & { $type: 'app.bsky.graph.defs#listView' } {
+  return is$typed(v, id, 'listView')
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView(v: unknown) {
+  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
 }
 
 export interface ListItemView {
@@ -69,16 +70,17 @@ export interface ListItemView {
   [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+export function isListItemView(
+  v: unknown,
+): v is ListItemView & { $type: 'app.bsky.graph.defs#listItemView' } {
+  return is$typed(v, id, 'listItemView')
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView(v: unknown) {
+  return lexicons.validate(
+    `${id}#listItemView`,
+    v,
+  ) as ValidationResult<ListItemView>
 }
 
 export interface StarterPackView {
@@ -96,16 +98,17 @@ export interface StarterPackView {
   [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+export function isStarterPackView(
+  v: unknown,
+): v is StarterPackView & { $type: 'app.bsky.graph.defs#starterPackView' } {
+  return is$typed(v, id, 'starterPackView')
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackView`,
+    v,
+  ) as ValidationResult<StarterPackView>
 }
 
 export interface StarterPackViewBasic {
@@ -121,16 +124,19 @@ export interface StarterPackViewBasic {
   [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+export function isStarterPackViewBasic(
+  v: unknown,
+): v is StarterPackViewBasic & {
+  $type: 'app.bsky.graph.defs#starterPackViewBasic'
+} {
+  return is$typed(v, id, 'starterPackViewBasic')
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackViewBasic`,
+    v,
+  ) as ValidationResult<StarterPackViewBasic>
 }
 
 export type ListPurpose =
@@ -152,16 +158,17 @@ export interface ListViewerState {
   [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+export function isListViewerState(
+  v: unknown,
+): v is ListViewerState & { $type: 'app.bsky.graph.defs#listViewerState' } {
+  return is$typed(v, id, 'listViewerState')
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewerState`,
+    v,
+  ) as ValidationResult<ListViewerState>
 }
 
 /** indicates that a handle or DID could not be resolved */
@@ -171,16 +178,17 @@ export interface NotFoundActor {
   [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+export function isNotFoundActor(
+  v: unknown,
+): v is NotFoundActor & { $type: 'app.bsky.graph.defs#notFoundActor' } {
+  return is$typed(v, id, 'notFoundActor')
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundActor`,
+    v,
+  ) as ValidationResult<NotFoundActor>
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
@@ -193,14 +201,15 @@ export interface Relationship {
   [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+export function isRelationship(
+  v: unknown,
+): v is Relationship & { $type: 'app.bsky.graph.defs#relationship' } {
+  return is$typed(v, id, 'relationship')
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship(v: unknown) {
+  return lexicons.validate(
+    `${id}#relationship`,
+    v,
+  ) as ValidationResult<Relationship>
 }
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 4b74a58a5df..62a91024b9d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.follow'
 
 export interface Record {
   subject: string
@@ -12,15 +14,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.follow#main' | 'app.bsky.graph.follow'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 10250d0f3b4..97e170748ba 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getActorStarterPacks'
+
 export interface QueryParams {
   actor: string
   limit: number
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 1fc9cd8ce37..897a5f4369b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 f5645eaef29..522f724a57b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
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 b9bd249da45..cd38a3ce0dc 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getFollows'
+
 export interface QueryParams {
   actor: string
   limit: number
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 f5645eaef29..f768f4641cb 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getKnownFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
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 864a81b3833..f2a28101921 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getList'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
   list: string
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 7399a14fadc..46f91ed6b70 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getListBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 7399a14fadc..e69a87f3949 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getListMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 dc0c4f18bea..f52261aab4b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getLists'
+
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
   actor: string
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 f450393522d..12cc1417996 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 bd6b6e765ed..e9e0cbe7941 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getRelationships'
+
 export interface QueryParams {
   /** Primary account requesting relationships for. */
   actor: string
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 93fe21f0b13..9a58898db30 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getStarterPack'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
   starterPack: string
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 4b9757b941e..55b817ec96e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getStarterPacks'
+
 export interface QueryParams {
   uris: string[]
 }
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 99b97e708f5..766f2ae2396 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getSuggestedFollowsByActor'
+
 export interface QueryParams {
   actor: string
 }
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 91c8ccee5bb..540745ff894 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyGraphDefs from './defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.graph.list'
+
 export interface Record {
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.graph.list#main' | 'app.bsky.graph.list' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 592778c7a51..0033adb86d8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.listblock'
 
 export interface Record {
   /** Reference (AT-URI) to the mod list record. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.listblock#main' | 'app.bsky.graph.listblock'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 5e93b34a111..c8b39c67071 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.listitem'
 
 export interface Record {
   /** The account which is included on the list. */
@@ -15,15 +17,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.listitem#main' | 'app.bsky.graph.listitem'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 baa9844046a..37bfa3a674e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.muteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6a68f680a1c..e741b3f2fc3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.muteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 928c56b6fc3..d8b89891f92 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.muteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 0daf8daf688..2029ef32d56 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 
+export const id = 'app.bsky.graph.starterpack'
+
 export interface Record {
   /** Display name for starter pack; can not be empty. */
   name: string
@@ -19,17 +21,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.starterpack#main' | 'app.bsky.graph.starterpack'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface FeedItem {
@@ -37,14 +36,12 @@ export interface FeedItem {
   [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+export function isFeedItem(
+  v: unknown,
+): v is FeedItem & { $type: 'app.bsky.graph.starterpack#feedItem' } {
+  return is$typed(v, id, 'feedItem')
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem(v: unknown) {
+  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
 }
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 baa9844046a..70155b11deb 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.unmuteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6a68f680a1c..a436151f54f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.unmuteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 928c56b6fc3..de6d5ba74d1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.unmuteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 e12c7203c57..e5e7aa2d9ba 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.labeler.defs'
+
 export interface LabelerView {
   uri: string
   cid: string
@@ -19,16 +21,17 @@ export interface LabelerView {
   [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+export function isLabelerView(
+  v: unknown,
+): v is LabelerView & { $type: 'app.bsky.labeler.defs#labelerView' } {
+  return is$typed(v, id, 'labelerView')
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerView`,
+    v,
+  ) as ValidationResult<LabelerView>
 }
 
 export interface LabelerViewDetailed {
@@ -43,16 +46,17 @@ export interface LabelerViewDetailed {
   [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed & {
+  $type: 'app.bsky.labeler.defs#labelerViewDetailed'
+} {
+  return is$typed(v, id, 'labelerViewDetailed')
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewDetailed`,
+    v,
+  ) as ValidationResult<LabelerViewDetailed>
 }
 
 export interface LabelerViewerState {
@@ -60,16 +64,17 @@ export interface LabelerViewerState {
   [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+export function isLabelerViewerState(v: unknown): v is LabelerViewerState & {
+  $type: 'app.bsky.labeler.defs#labelerViewerState'
+} {
+  return is$typed(v, id, 'labelerViewerState')
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewerState`,
+    v,
+  ) as ValidationResult<LabelerViewerState>
 }
 
 export interface LabelerPolicies {
@@ -80,14 +85,15 @@ export interface LabelerPolicies {
   [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+export function isLabelerPolicies(
+  v: unknown,
+): v is LabelerPolicies & { $type: 'app.bsky.labeler.defs#labelerPolicies' } {
+  return is$typed(v, id, 'labelerPolicies')
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPolicies`,
+    v,
+  ) as ValidationResult<LabelerPolicies>
 }
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 faeb30b4798..0f2e4e34509 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyLabelerDefs from './defs'
 
+export const id = 'app.bsky.labeler.getServices'
+
 export interface QueryParams {
   dids: string[]
   detailed: boolean
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 a044b8699b6..b510e8e58f5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyLabelerDefs from './defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.labeler.service'
+
 export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?:
@@ -17,15 +19,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.labeler.service#main' | 'app.bsky.labeler.service'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 3931e24d3f0..3d12fc24af9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.getUnreadCount'
+
 export interface QueryParams {
   priority?: boolean
   seenAt?: string
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 70adc412701..c930071b193 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.notification.listNotifications'
+
 export interface QueryParams {
   limit: number
   priority?: boolean
@@ -74,17 +76,15 @@ export interface Notification {
   [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+export function isNotification(v: unknown): v is Notification & {
+  $type: 'app.bsky.notification.listNotifications#notification'
+} {
+  return is$typed(v, id, 'notification')
 }
 
-export function validateNotification(v: unknown): ValidationResult {
+export function validateNotification(v: unknown) {
   return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
+    `${id}#notification`,
     v,
-  )
+  ) as ValidationResult<Notification>
 }
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 2c3a9d6fdbb..ef9b16d26ee 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 cce8f95839d..2a0596065a4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.registerPush'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 93db017a152..e83855b62b1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.updateSeen'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 139b5382caf..706ea4a3905 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
@@ -13,17 +15,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.richtext.facet#main' | 'app.bsky.richtext.facet'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
@@ -32,16 +31,14 @@ export interface Mention {
   [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+export function isMention(
+  v: unknown,
+): v is Mention & { $type: 'app.bsky.richtext.facet#mention' } {
+  return is$typed(v, id, 'mention')
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention(v: unknown) {
+  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
@@ -50,16 +47,14 @@ export interface Link {
   [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+export function isLink(
+  v: unknown,
+): v is Link & { $type: 'app.bsky.richtext.facet#link' } {
+  return is$typed(v, id, 'link')
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink(v: unknown) {
+  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
 }
 
 /** 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'). */
@@ -68,14 +63,14 @@ export interface Tag {
   [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+export function isTag(
+  v: unknown,
+): v is Tag & { $type: 'app.bsky.richtext.facet#tag' } {
+  return is$typed(v, id, 'tag')
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag(v: unknown) {
+  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
 }
 
 /** 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. */
@@ -85,14 +80,12 @@ export interface ByteSlice {
   [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+export function isByteSlice(
+  v: unknown,
+): v is ByteSlice & { $type: 'app.bsky.richtext.facet#byteSlice' } {
+  return is$typed(v, id, 'byteSlice')
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice(v: unknown) {
+  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
 }
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 59a6b38064c..980a3b50089 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
   uri: string
   [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost & {
+  $type: 'app.bsky.unspecced.defs#skeletonSearchPost'
+} {
+  return is$typed(v, id, 'skeletonSearchPost')
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchPost`,
+    v,
+  ) as ValidationResult<SkeletonSearchPost>
 }
 
 export interface SkeletonSearchActor {
@@ -28,14 +31,15 @@ export interface SkeletonSearchActor {
   [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor & {
+  $type: 'app.bsky.unspecced.defs#skeletonSearchActor'
+} {
+  return is$typed(v, id, 'skeletonSearchActor')
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchActor`,
+    v,
+  ) as ValidationResult<SkeletonSearchActor>
 }
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 da202ab0d54..b054827943a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.unspecced.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 02f19f3cc6a..bb5f5b19196 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+export const id = 'app.bsky.unspecced.getPopularFeedGenerators'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 b801fa34d72..7ec896318cb 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
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 a03f442140d..0e67f7c3a65 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.unspecced.getTaggedSuggestions'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,17 +51,15 @@ export interface Suggestion {
   [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+export function isSuggestion(v: unknown): v is Suggestion & {
+  $type: 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
+} {
+  return is$typed(v, id, 'suggestion')
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
+export function validateSuggestion(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
+    `${id}#suggestion`,
     v,
-  )
+  ) as ValidationResult<Suggestion>
 }
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 94295f45349..7e941e4dfa9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.searchActorsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
   q: string
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 cd293454902..01c6b678247 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.searchPostsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
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 12f4d674794..14d8d9ee41a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
   jobId: string
@@ -19,14 +21,12 @@ export interface JobStatus {
   [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+export function isJobStatus(
+  v: unknown,
+): v is JobStatus & { $type: 'app.bsky.video.defs#jobStatus' } {
+  return is$typed(v, id, 'jobStatus')
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus(v: unknown) {
+  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
 }
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 3e075ba2195..d2aac514ae9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+export const id = 'app.bsky.video.getJobStatus'
+
 export interface QueryParams {
   jobId: string
 }
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 f0f23003b0b..b769714371b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.video.getUploadLimits'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 c23ff677a4b..39c8b6c9ac4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -4,12 +4,14 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+export const id = 'app.bsky.video.uploadVideo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
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 b837351c1e1..6b4b30f1e0d 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'chat.bsky.actor.declaration#main' | 'chat.bsky.actor.declaration'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 8a05d480784..af004d93be9 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'chat.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,14 +23,15 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(
+  v: unknown,
+): v is ProfileViewBasic & { $type: 'chat.bsky.actor.defs#profileViewBasic' } {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
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 08714990fcb..753ea0d7e56 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.actor.deleteAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 f6f38ab2fb3..73b7bc7e050 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.actor.exportAccountData'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 b2452410be2..d56ce0dbbb5 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
 
+export const id = 'chat.bsky.convo.defs'
+
 export interface MessageRef {
   did: string
   convoId: string
@@ -16,16 +18,17 @@ export interface MessageRef {
   [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+export function isMessageRef(
+  v: unknown,
+): v is MessageRef & { $type: 'chat.bsky.convo.defs#messageRef' } {
+  return is$typed(v, id, 'messageRef')
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageRef`,
+    v,
+  ) as ValidationResult<MessageRef>
 }
 
 export interface MessageInput {
@@ -36,16 +39,17 @@ export interface MessageInput {
   [k: string]: unknown
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+export function isMessageInput(
+  v: unknown,
+): v is MessageInput & { $type: 'chat.bsky.convo.defs#messageInput' } {
+  return is$typed(v, id, 'messageInput')
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageInput`,
+    v,
+  ) as ValidationResult<MessageInput>
 }
 
 export interface MessageView {
@@ -60,16 +64,17 @@ export interface MessageView {
   [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+export function isMessageView(
+  v: unknown,
+): v is MessageView & { $type: 'chat.bsky.convo.defs#messageView' } {
+  return is$typed(v, id, 'messageView')
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageView`,
+    v,
+  ) as ValidationResult<MessageView>
 }
 
 export interface DeletedMessageView {
@@ -80,16 +85,17 @@ export interface DeletedMessageView {
   [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+export function isDeletedMessageView(v: unknown): v is DeletedMessageView & {
+  $type: 'chat.bsky.convo.defs#deletedMessageView'
+} {
+  return is$typed(v, id, 'deletedMessageView')
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#deletedMessageView`,
+    v,
+  ) as ValidationResult<DeletedMessageView>
 }
 
 export interface MessageViewSender {
@@ -97,16 +103,17 @@ export interface MessageViewSender {
   [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+export function isMessageViewSender(v: unknown): v is MessageViewSender & {
+  $type: 'chat.bsky.convo.defs#messageViewSender'
+} {
+  return is$typed(v, id, 'messageViewSender')
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageViewSender`,
+    v,
+  ) as ValidationResult<MessageViewSender>
 }
 
 export interface ConvoView {
@@ -123,16 +130,14 @@ export interface ConvoView {
   [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+export function isConvoView(
+  v: unknown,
+): v is ConvoView & { $type: 'chat.bsky.convo.defs#convoView' } {
+  return is$typed(v, id, 'convoView')
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView(v: unknown) {
+  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
 }
 
 export interface LogBeginConvo {
@@ -141,16 +146,17 @@ export interface LogBeginConvo {
   [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+export function isLogBeginConvo(
+  v: unknown,
+): v is LogBeginConvo & { $type: 'chat.bsky.convo.defs#logBeginConvo' } {
+  return is$typed(v, id, 'logBeginConvo')
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logBeginConvo`,
+    v,
+  ) as ValidationResult<LogBeginConvo>
 }
 
 export interface LogLeaveConvo {
@@ -159,16 +165,17 @@ export interface LogLeaveConvo {
   [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+export function isLogLeaveConvo(
+  v: unknown,
+): v is LogLeaveConvo & { $type: 'chat.bsky.convo.defs#logLeaveConvo' } {
+  return is$typed(v, id, 'logLeaveConvo')
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logLeaveConvo`,
+    v,
+  ) as ValidationResult<LogLeaveConvo>
 }
 
 export interface LogCreateMessage {
@@ -181,16 +188,17 @@ export interface LogCreateMessage {
   [k: string]: unknown
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+export function isLogCreateMessage(
+  v: unknown,
+): v is LogCreateMessage & { $type: 'chat.bsky.convo.defs#logCreateMessage' } {
+  return is$typed(v, id, 'logCreateMessage')
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logCreateMessage`,
+    v,
+  ) as ValidationResult<LogCreateMessage>
 }
 
 export interface LogDeleteMessage {
@@ -203,14 +211,15 @@ export interface LogDeleteMessage {
   [k: string]: unknown
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+export function isLogDeleteMessage(
+  v: unknown,
+): v is LogDeleteMessage & { $type: 'chat.bsky.convo.defs#logDeleteMessage' } {
+  return is$typed(v, id, 'logDeleteMessage')
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logDeleteMessage`,
+    v,
+  ) as ValidationResult<LogDeleteMessage>
 }
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 c05bc99b36a..ae3e904f1bd 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.deleteMessageForSelf'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 1448c75b306..06a188fb031 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getConvo'
+
 export interface QueryParams {
   convoId: string
 }
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 108dfd6ad5b..dfdfe34a722 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getConvoForMembers'
+
 export interface QueryParams {
   members: string[]
 }
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 89f6778c4d3..7e035a90201 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getLog'
+
 export interface QueryParams {
   cursor?: string
 }
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 a615ba37674..e5878ad980c 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getMessages'
+
 export interface QueryParams {
   convoId: string
   limit: number
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 8b76a7b0c75..086e4bf78e8 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.convo.leaveConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 4d6f35bf39c..b253dd9cfc1 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.listConvos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 ddb57623913..bf88be58357 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.muteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 ab2d8b03f89..da4d7a40828 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.sendMessage'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b3c2c2bc252..27d92c4bfcf 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.sendMessageBatch'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -55,14 +57,12 @@ export interface BatchItem {
   [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+export function isBatchItem(
+  v: unknown,
+): v is BatchItem & { $type: 'chat.bsky.convo.sendMessageBatch#batchItem' } {
+  return is$typed(v, id, 'batchItem')
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem(v: unknown) {
+  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
 }
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 ddb57623913..d8eb32a25a2 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.unmuteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b879cde82b0..d1a58113725 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.updateRead'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 077a0076bab..30842b4fc87 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.moderation.getActorMetadata'
+
 export interface QueryParams {
   actor: string
 }
@@ -54,14 +56,12 @@ export interface Metadata {
   [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+export function isMetadata(
+  v: unknown,
+): v is Metadata & { $type: 'chat.bsky.moderation.getActorMetadata#metadata' } {
+  return is$typed(v, id, 'metadata')
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata(v: unknown) {
+  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
 }
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 0a1f5b1b691..37358f83f28 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from '../convo/defs'
 
+export const id = 'chat.bsky.moderation.getMessageContext'
+
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
   convoId?: string
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 d9c95f69643..975584fea52 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.moderation.updateActorAccess'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 f58b7c7ece4..e428182996b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
@@ -2,27 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+export const id = 'com.atproto.admin.defs'
+
 export interface StatusAttr {
   applied: boolean
   ref?: string
   [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+export function isStatusAttr(
+  v: unknown,
+): v is StatusAttr & { $type: 'com.atproto.admin.defs#statusAttr' } {
+  return is$typed(v, id, 'statusAttr')
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr(v: unknown) {
+  return lexicons.validate(
+    `${id}#statusAttr`,
+    v,
+  ) as ValidationResult<StatusAttr>
 }
 
 export interface AccountView {
@@ -41,16 +44,17 @@ export interface AccountView {
   [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+export function isAccountView(
+  v: unknown,
+): v is AccountView & { $type: 'com.atproto.admin.defs#accountView' } {
+  return is$typed(v, id, 'accountView')
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountView`,
+    v,
+  ) as ValidationResult<AccountView>
 }
 
 export interface RepoRef {
@@ -58,16 +62,14 @@ export interface RepoRef {
   [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+export function isRepoRef(
+  v: unknown,
+): v is RepoRef & { $type: 'com.atproto.admin.defs#repoRef' } {
+  return is$typed(v, id, 'repoRef')
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef(v: unknown) {
+  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
 }
 
 export interface RepoBlobRef {
@@ -77,16 +79,17 @@ export interface RepoBlobRef {
   [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+export function isRepoBlobRef(
+  v: unknown,
+): v is RepoBlobRef & { $type: 'com.atproto.admin.defs#repoBlobRef' } {
+  return is$typed(v, id, 'repoBlobRef')
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoBlobRef`,
+    v,
+  ) as ValidationResult<RepoBlobRef>
 }
 
 export interface ThreatSignature {
@@ -95,14 +98,15 @@ export interface ThreatSignature {
   [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+export function isThreatSignature(
+  v: unknown,
+): v is ThreatSignature & { $type: 'com.atproto.admin.defs#threatSignature' } {
+  return is$typed(v, id, 'threatSignature')
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature(v: unknown) {
+  return lexicons.validate(
+    `${id}#threatSignature`,
+    v,
+  ) as ValidationResult<ThreatSignature>
 }
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 003c1b5ebcd..166e66e175f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 68c6503d95e..d9a061d7ebc 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.disableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 2bf8de35583..55e3ed71292 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.disableInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 3f2836e7142..912fc54e591 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.enableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 c7b840a153d..045b14e8b48 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.getAccountInfo'
+
 export interface QueryParams {
   did: string
 }
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 99ef44a99f5..332389f8dca 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.getAccountInfos'
+
 export interface QueryParams {
   dids: string[]
 }
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 d68b97d775a..9c59ba185a7 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+export const id = 'com.atproto.admin.getInviteCodes'
+
 export interface QueryParams {
   sort: 'recent' | 'usage' | (string & {})
   limit: number
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 c13496638c8..fbcdeb0016f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+export const id = 'com.atproto.admin.getSubjectStatus'
+
 export interface QueryParams {
   did?: string
   uri?: string
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 80d0eecd926..4c5354d87ed 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.searchAccounts'
+
 export interface QueryParams {
   email?: string
   cursor?: string
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 836fba39f79..a79f0942d87 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.sendEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 ebabffbccdb..552da287fa8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.updateAccountEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 d6dc4a2dc25..556625556dd 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.updateAccountHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 948568f0d3d..1cd4ae387a2 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.updateAccountPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 c03d9667cae..a27e65ef2b9 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+export const id = 'com.atproto.admin.updateSubjectStatus'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 5fa374de737..1e20823680f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.getRecommendedDidCredentials'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 82672f1d1c7..817075fd25a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.requestPlcOperationSignature'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 05019df6166..3fd5046e04a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.resolveHandle'
+
 export interface QueryParams {
   /** The handle to resolve. */
   handle: string
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 3c908c049f2..f349ce572dc 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.signPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 5290b55d023..788c8ce7b82 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.submitPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 f451d1f57c7..c68bb2b27e5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.updateHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 348e985622b..15f11ef9919 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
@@ -29,16 +31,14 @@ export interface Label {
   [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+export function isLabel(
+  v: unknown,
+): v is Label & { $type: 'com.atproto.label.defs#label' } {
+  return is$typed(v, id, 'label')
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel(v: unknown) {
+  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
@@ -47,16 +47,17 @@ export interface SelfLabels {
   [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+export function isSelfLabels(
+  v: unknown,
+): v is SelfLabels & { $type: 'com.atproto.label.defs#selfLabels' } {
+  return is$typed(v, id, 'selfLabels')
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels(v: unknown) {
+  return lexicons.validate(
+    `${id}#selfLabels`,
+    v,
+  ) as ValidationResult<SelfLabels>
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
@@ -66,16 +67,14 @@ export interface SelfLabel {
   [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+export function isSelfLabel(
+  v: unknown,
+): v is SelfLabel & { $type: 'com.atproto.label.defs#selfLabel' } {
+  return is$typed(v, id, 'selfLabel')
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel(v: unknown) {
+  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
@@ -94,16 +93,19 @@ export interface LabelValueDefinition {
   [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+export function isLabelValueDefinition(
+  v: unknown,
+): v is LabelValueDefinition & {
+  $type: 'com.atproto.label.defs#labelValueDefinition'
+} {
+  return is$typed(v, id, 'labelValueDefinition')
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelValueDefinition`,
+    v,
+  ) as ValidationResult<LabelValueDefinition>
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
@@ -119,21 +121,17 @@ export interface LabelValueDefinitionStrings {
 
 export function isLabelValueDefinitionStrings(
   v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+): v is LabelValueDefinitionStrings & {
+  $type: 'com.atproto.label.defs#labelValueDefinitionStrings'
+} {
+  return is$typed(v, id, 'labelValueDefinitionStrings')
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
+export function validateLabelValueDefinitionStrings(v: unknown) {
   return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+    `${id}#labelValueDefinitionStrings`,
     v,
-  )
+  ) as ValidationResult<LabelValueDefinitionStrings>
 }
 
 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 0c9d55a6961..aafadf6eb75 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from './defs'
 
+export const id = 'com.atproto.label.queryLabels'
+
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
   uriPatterns: string[]
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 6034b35d895..6d2b9fad745 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 import * as ComAtprotoLabelDefs from './defs'
 
+export const id = 'com.atproto.label.subscribeLabels'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -36,16 +38,14 @@ export interface Labels {
   [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+export function isLabels(
+  v: unknown,
+): v is Labels & { $type: 'com.atproto.label.subscribeLabels#labels' } {
+  return is$typed(v, id, 'labels')
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels(v: unknown) {
+  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
 }
 
 export interface Info {
@@ -54,14 +54,12 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: 'com.atproto.label.subscribeLabels#info' } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
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 aa3f810a91c..ac54e90ca42 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -3,14 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } 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'
 
+export const id = 'com.atproto.moderation.createReport'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 08e555c2422..cce51afac4a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
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 4e3c8dcef3d..a3c40d943f8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.applyWrites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -65,16 +67,14 @@ export interface Create {
   [k: string]: unknown
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+export function isCreate(
+  v: unknown,
+): v is Create & { $type: 'com.atproto.repo.applyWrites#create' } {
+  return is$typed(v, id, 'create')
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate(v: unknown) {
+  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
 }
 
 /** Operation which updates an existing record. */
@@ -85,16 +85,14 @@ export interface Update {
   [k: string]: unknown
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+export function isUpdate(
+  v: unknown,
+): v is Update & { $type: 'com.atproto.repo.applyWrites#update' } {
+  return is$typed(v, id, 'update')
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate(v: unknown) {
+  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
 }
 
 /** Operation which deletes an existing record. */
@@ -104,16 +102,14 @@ export interface Delete {
   [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+export function isDelete(
+  v: unknown,
+): v is Delete & { $type: 'com.atproto.repo.applyWrites#delete' } {
+  return is$typed(v, id, 'delete')
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete(v: unknown) {
+  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
 }
 
 export interface CreateResult {
@@ -123,16 +119,17 @@ export interface CreateResult {
   [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+export function isCreateResult(
+  v: unknown,
+): v is CreateResult & { $type: 'com.atproto.repo.applyWrites#createResult' } {
+  return is$typed(v, id, 'createResult')
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#createResult`,
+    v,
+  ) as ValidationResult<CreateResult>
 }
 
 export interface UpdateResult {
@@ -142,30 +139,32 @@ export interface UpdateResult {
   [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+export function isUpdateResult(
+  v: unknown,
+): v is UpdateResult & { $type: 'com.atproto.repo.applyWrites#updateResult' } {
+  return is$typed(v, id, 'updateResult')
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#updateResult`,
+    v,
+  ) as ValidationResult<UpdateResult>
 }
 
 export interface DeleteResult {
   [k: string]: unknown
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+export function isDeleteResult(
+  v: unknown,
+): v is DeleteResult & { $type: 'com.atproto.repo.applyWrites#deleteResult' } {
+  return is$typed(v, id, 'deleteResult')
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#deleteResult`,
+    v,
+  ) as ValidationResult<DeleteResult>
 }
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 5cac0848bf1..d48f93d5754 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.createRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 8357fe2a611..174e203464e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
   cid: string
@@ -12,14 +14,15 @@ export interface CommitMeta {
   [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+export function isCommitMeta(
+  v: unknown,
+): v is CommitMeta & { $type: 'com.atproto.repo.defs#commitMeta' } {
+  return is$typed(v, id, 'commitMeta')
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta(v: unknown) {
+  return lexicons.validate(
+    `${id}#commitMeta`,
+    v,
+  ) as ValidationResult<CommitMeta>
 }
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 e594cd00adf..76ee12900ac 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.deleteRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 749bedcfeb7..130f12e5414 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.describeRepo'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
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 9d03da19530..714c72a1a73 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.getRecord'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
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 59288c7a027..ce1308eefee 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.importRepo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
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 40f4d385e47..b5ee1a58803 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.listMissingBlobs'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -52,14 +54,15 @@ export interface RecordBlob {
   [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+export function isRecordBlob(
+  v: unknown,
+): v is RecordBlob & { $type: 'com.atproto.repo.listMissingBlobs#recordBlob' } {
+  return is$typed(v, id, 'recordBlob')
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordBlob`,
+    v,
+  ) as ValidationResult<RecordBlob>
 }
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 f46f6eb0f7f..f0f5239ab5e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.listRecords'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -64,14 +66,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'com.atproto.repo.listRecords#record' } {
+  return is$typed(v, id, 'record')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
 }
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 5cde768d7c2..dca58eb45a1 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.putRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 8b21a6ddf81..1bf0c9a4218 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
   uri: string
@@ -12,15 +14,12 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'com.atproto.repo.strongRef#main' | 'com.atproto.repo.strongRef'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
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 4a712346a0b..fd093015e5d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.uploadBlob'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
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 82672f1d1c7..47ff541186e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.activateAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 f17182a8dce..e6ba5dd7a5a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.checkAccountStatus'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 b667a04b996..5f45b6241e0 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.confirmEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6e9b2f9f3c2..6e46102755d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 00657a2058f..bcaa2d4f426 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -57,17 +59,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: 'com.atproto.server.createAppPassword#appPassword'
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
+export function validateAppPassword(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
+    `${id}#appPassword`,
     v,
-  )
+  ) as ValidationResult<AppPassword>
 }
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 9cfeacc7e28..4c7bdc68221 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createInviteCode'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 eb6cd2bb1b1..bf9207dbae9 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -56,17 +58,15 @@ export interface AccountCodes {
   [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+export function isAccountCodes(v: unknown): v is AccountCodes & {
+  $type: 'com.atproto.server.createInviteCodes#accountCodes'
+} {
+  return is$typed(v, id, 'accountCodes')
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
+export function validateAccountCodes(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
+    `${id}#accountCodes`,
     v,
-  )
+  ) as ValidationResult<AccountCodes>
 }
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 96f7d79d5bc..a4f9b4ea299 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createSession'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b3793d6b2e0..21fb1da53eb 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.deactivateAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 9bd67c9d7a5..69a456c9ebf 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
   code: string
@@ -17,16 +19,17 @@ export interface InviteCode {
   [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+export function isInviteCode(
+  v: unknown,
+): v is InviteCode & { $type: 'com.atproto.server.defs#inviteCode' } {
+  return is$typed(v, id, 'inviteCode')
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCode`,
+    v,
+  ) as ValidationResult<InviteCode>
 }
 
 export interface InviteCodeUse {
@@ -35,14 +38,15 @@ export interface InviteCodeUse {
   [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+export function isInviteCodeUse(
+  v: unknown,
+): v is InviteCodeUse & { $type: 'com.atproto.server.defs#inviteCodeUse' } {
+  return is$typed(v, id, 'inviteCodeUse')
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCodeUse`,
+    v,
+  ) as ValidationResult<InviteCodeUse>
 }
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 4fcec360a11..65e6c4b4d67 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 82672f1d1c7..54172a5b52f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.deleteSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 e21868158b3..bb2b13511cf 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.describeServer'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -56,16 +58,14 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: 'com.atproto.server.describeServer#links' } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
 
 export interface Contact {
@@ -73,14 +73,12 @@ export interface Contact {
   [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+export function isContact(
+  v: unknown,
+): v is Contact & { $type: 'com.atproto.server.describeServer#contact' } {
+  return is$typed(v, id, 'contact')
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact(v: unknown) {
+  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
 }
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 82c3ffa8c31..b2400f07631 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from './defs'
 
+export const id = 'com.atproto.server.getAccountInviteCodes'
+
 export interface QueryParams {
   includeUsed: boolean
   /** Controls whether any new 'earned' but not 'created' invites should be created. */
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 14f249fde44..87dd567bec1 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.getServiceAuth'
+
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
   aud: string
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 be34cb92afd..94c3063e409 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.getSession'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 397e7043e67..ce8a2b15722 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.listAppPasswords'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -50,14 +52,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: 'com.atproto.server.listAppPasswords#appPassword'
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword(v: unknown) {
+  return lexicons.validate(
+    `${id}#appPassword`,
+    v,
+  ) as ValidationResult<AppPassword>
 }
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 1d6272a0d71..0171f856e80 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.refreshSession'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 82672f1d1c7..147c1bef1ac 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestAccountDelete'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 82672f1d1c7..4ed07343349 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestEmailConfirmation'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 24dce3e12af..3da1fe9262b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestEmailUpdate'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 d0f3f2ad769..a89ba697b7b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestPasswordReset'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 0ec1e80c77c..59326f3d943 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.reserveSigningKey'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 38f63382cf0..e7b0fd81641 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.resetPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 769ad6aa521..849415e4a27 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.revokeAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 34fc7421979..692cfe6763d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.updateEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b1581d6e473..4cf3f512668 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getBlob'
+
 export interface QueryParams {
   /** The DID of the account. */
   did: string
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 925b4a7d50b..919d5867f6e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getBlocks'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 51856b9088d..62f07fd839b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getCheckout'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 adedd4cf211..f0f4a380c5e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getHead'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 f0e9a757d04..22a04bd1f8e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getLatestCommit'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 83d88655228..80ec16706f5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getRecord'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 883ff37def1..1790893b7a8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getRepo'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 00abbeaa84b..e0846692f81 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getRepoStatus'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 c6ea955ee0c..6372388b6dd 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.listBlobs'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 5628b0b5147..5074c8aa772 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.listRepos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -57,14 +59,12 @@ export interface Repo {
   [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+export function isRepo(
+  v: unknown,
+): v is Repo & { $type: 'com.atproto.sync.listRepos#repo' } {
+  return is$typed(v, id, 'repo')
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo(v: unknown) {
+  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
 }
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 8a0af577c7c..48c853fc46e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.notifyOfUpdate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 31180aabf58..44827aa5507 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.requestCrawl'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 8f9855a5da4..0e8194cc1e9 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 
+export const id = 'com.atproto.sync.subscribeRepos'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -61,16 +63,14 @@ export interface Commit {
   [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+export function isCommit(
+  v: unknown,
+): v is Commit & { $type: 'com.atproto.sync.subscribeRepos#commit' } {
+  return is$typed(v, id, 'commit')
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit(v: unknown) {
+  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
 }
 
 /** 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. */
@@ -83,16 +83,14 @@ export interface Identity {
   [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+export function isIdentity(
+  v: unknown,
+): v is Identity & { $type: 'com.atproto.sync.subscribeRepos#identity' } {
+  return is$typed(v, id, 'identity')
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity(v: unknown) {
+  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
 }
 
 /** 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. */
@@ -107,16 +105,14 @@ export interface Account {
   [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+export function isAccount(
+  v: unknown,
+): v is Account & { $type: 'com.atproto.sync.subscribeRepos#account' } {
+  return is$typed(v, id, 'account')
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount(v: unknown) {
+  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
 }
 
 /** DEPRECATED -- Use #identity event instead */
@@ -128,16 +124,14 @@ export interface Handle {
   [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+export function isHandle(
+  v: unknown,
+): v is Handle & { $type: 'com.atproto.sync.subscribeRepos#handle' } {
+  return is$typed(v, id, 'handle')
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle(v: unknown) {
+  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -149,16 +143,14 @@ export interface Migrate {
   [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+export function isMigrate(
+  v: unknown,
+): v is Migrate & { $type: 'com.atproto.sync.subscribeRepos#migrate' } {
+  return is$typed(v, id, 'migrate')
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate(v: unknown) {
+  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -169,16 +161,14 @@ export interface Tombstone {
   [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+export function isTombstone(
+  v: unknown,
+): v is Tombstone & { $type: 'com.atproto.sync.subscribeRepos#tombstone' } {
+  return is$typed(v, id, 'tombstone')
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone(v: unknown) {
+  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
 }
 
 export interface Info {
@@ -187,16 +177,14 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: 'com.atproto.sync.subscribeRepos#info' } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
 
 /** A repo operation, ie a mutation of a single record. */
@@ -208,14 +196,12 @@ export interface RepoOp {
   [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+export function isRepoOp(
+  v: unknown,
+): v is RepoOp & { $type: 'com.atproto.sync.subscribeRepos#repoOp' } {
+  return is$typed(v, id, 'repoOp')
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp(v: unknown) {
+  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
 }
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 9486bce2b2b..3fa4f04db56 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.temp.checkSignupQueue'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 0fbdeed1196..f52407cef2b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from '../label/defs'
 
+export const id = 'com.atproto.temp.fetchLabels'
+
 export interface QueryParams {
   since?: number
   limit: number
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 c977500fc33..c384b552934 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.temp.requestPhoneVerification'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6d29f93bdba..81930ed38d1 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+export const id = 'tools.ozone.communication.createTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 1342dc3c399..0e13e5952cf 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
   id: string
@@ -24,14 +26,15 @@ export interface TemplateView {
   [k: string]: unknown
 }
 
-export function isTemplateView(v: unknown): v is TemplateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.communication.defs#templateView'
-  )
+export function isTemplateView(v: unknown): v is TemplateView & {
+  $type: 'tools.ozone.communication.defs#templateView'
+} {
+  return is$typed(v, id, 'templateView')
 }
 
-export function validateTemplateView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.communication.defs#templateView', v)
+export function validateTemplateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#templateView`,
+    v,
+  ) as ValidationResult<TemplateView>
 }
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 c5ae5cd469f..08fd990f56f 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.communication.deleteTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 4573ac7bbb9..272c6ed4425 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+export const id = 'tools.ozone.communication.listTemplates'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 f8c5817b4d9..48dda69cf90 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+export const id = 'tools.ozone.communication.updateTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 2ce5e2965cf..8f525a8a46b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
@@ -12,6 +12,8 @@ import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
 import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'tools.ozone.moderation.defs'
+
 export interface ModEventView {
   id: number
   event:
@@ -47,16 +49,17 @@ export interface ModEventView {
   [k: string]: unknown
 }
 
-export function isModEventView(v: unknown): v is ModEventView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventView'
-  )
+export function isModEventView(
+  v: unknown,
+): v is ModEventView & { $type: 'tools.ozone.moderation.defs#modEventView' } {
+  return is$typed(v, id, 'modEventView')
 }
 
-export function validateModEventView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventView', v)
+export function validateModEventView(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventView`,
+    v,
+  ) as ValidationResult<ModEventView>
 }
 
 export interface ModEventViewDetail {
@@ -93,16 +96,17 @@ export interface ModEventViewDetail {
   [k: string]: unknown
 }
 
-export function isModEventViewDetail(v: unknown): v is ModEventViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventViewDetail'
-  )
+export function isModEventViewDetail(v: unknown): v is ModEventViewDetail & {
+  $type: 'tools.ozone.moderation.defs#modEventViewDetail'
+} {
+  return is$typed(v, id, 'modEventViewDetail')
 }
 
-export function validateModEventViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventViewDetail', v)
+export function validateModEventViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventViewDetail`,
+    v,
+  ) as ValidationResult<ModEventViewDetail>
 }
 
 export interface SubjectStatusView {
@@ -139,16 +143,17 @@ export interface SubjectStatusView {
   [k: string]: unknown
 }
 
-export function isSubjectStatusView(v: unknown): v is SubjectStatusView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#subjectStatusView'
-  )
+export function isSubjectStatusView(v: unknown): v is SubjectStatusView & {
+  $type: 'tools.ozone.moderation.defs#subjectStatusView'
+} {
+  return is$typed(v, id, 'subjectStatusView')
 }
 
-export function validateSubjectStatusView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
+export function validateSubjectStatusView(v: unknown) {
+  return lexicons.validate(
+    `${id}#subjectStatusView`,
+    v,
+  ) as ValidationResult<SubjectStatusView>
 }
 
 export type SubjectReviewState =
@@ -177,16 +182,17 @@ export interface ModEventTakedown {
   [k: string]: unknown
 }
 
-export function isModEventTakedown(v: unknown): v is ModEventTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTakedown'
-  )
+export function isModEventTakedown(v: unknown): v is ModEventTakedown & {
+  $type: 'tools.ozone.moderation.defs#modEventTakedown'
+} {
+  return is$typed(v, id, 'modEventTakedown')
 }
 
-export function validateModEventTakedown(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTakedown', v)
+export function validateModEventTakedown(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTakedown`,
+    v,
+  ) as ValidationResult<ModEventTakedown>
 }
 
 /** Revert take down action on a subject */
@@ -198,19 +204,17 @@ export interface ModEventReverseTakedown {
 
 export function isModEventReverseTakedown(
   v: unknown,
-): v is ModEventReverseTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReverseTakedown'
-  )
+): v is ModEventReverseTakedown & {
+  $type: 'tools.ozone.moderation.defs#modEventReverseTakedown'
+} {
+  return is$typed(v, id, 'modEventReverseTakedown')
 }
 
-export function validateModEventReverseTakedown(v: unknown): ValidationResult {
+export function validateModEventReverseTakedown(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventReverseTakedown',
+    `${id}#modEventReverseTakedown`,
     v,
-  )
+  ) as ValidationResult<ModEventReverseTakedown>
 }
 
 /** Resolve appeal on a subject */
@@ -222,19 +226,17 @@ export interface ModEventResolveAppeal {
 
 export function isModEventResolveAppeal(
   v: unknown,
-): v is ModEventResolveAppeal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventResolveAppeal'
-  )
+): v is ModEventResolveAppeal & {
+  $type: 'tools.ozone.moderation.defs#modEventResolveAppeal'
+} {
+  return is$typed(v, id, 'modEventResolveAppeal')
 }
 
-export function validateModEventResolveAppeal(v: unknown): ValidationResult {
+export function validateModEventResolveAppeal(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventResolveAppeal',
+    `${id}#modEventResolveAppeal`,
     v,
-  )
+  ) as ValidationResult<ModEventResolveAppeal>
 }
 
 /** Add a comment to a subject */
@@ -245,16 +247,17 @@ export interface ModEventComment {
   [k: string]: unknown
 }
 
-export function isModEventComment(v: unknown): v is ModEventComment {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventComment'
-  )
+export function isModEventComment(v: unknown): v is ModEventComment & {
+  $type: 'tools.ozone.moderation.defs#modEventComment'
+} {
+  return is$typed(v, id, 'modEventComment')
 }
 
-export function validateModEventComment(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventComment', v)
+export function validateModEventComment(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventComment`,
+    v,
+  ) as ValidationResult<ModEventComment>
 }
 
 /** Report a subject */
@@ -266,16 +269,17 @@ export interface ModEventReport {
   [k: string]: unknown
 }
 
-export function isModEventReport(v: unknown): v is ModEventReport {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReport'
-  )
+export function isModEventReport(v: unknown): v is ModEventReport & {
+  $type: 'tools.ozone.moderation.defs#modEventReport'
+} {
+  return is$typed(v, id, 'modEventReport')
 }
 
-export function validateModEventReport(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventReport', v)
+export function validateModEventReport(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventReport`,
+    v,
+  ) as ValidationResult<ModEventReport>
 }
 
 /** Apply/Negate labels on a subject */
@@ -286,16 +290,17 @@ export interface ModEventLabel {
   [k: string]: unknown
 }
 
-export function isModEventLabel(v: unknown): v is ModEventLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventLabel'
-  )
+export function isModEventLabel(
+  v: unknown,
+): v is ModEventLabel & { $type: 'tools.ozone.moderation.defs#modEventLabel' } {
+  return is$typed(v, id, 'modEventLabel')
 }
 
-export function validateModEventLabel(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
+export function validateModEventLabel(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventLabel`,
+    v,
+  ) as ValidationResult<ModEventLabel>
 }
 
 export interface ModEventAcknowledge {
@@ -303,16 +308,17 @@ export interface ModEventAcknowledge {
   [k: string]: unknown
 }
 
-export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventAcknowledge'
-  )
+export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge & {
+  $type: 'tools.ozone.moderation.defs#modEventAcknowledge'
+} {
+  return is$typed(v, id, 'modEventAcknowledge')
 }
 
-export function validateModEventAcknowledge(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventAcknowledge', v)
+export function validateModEventAcknowledge(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventAcknowledge`,
+    v,
+  ) as ValidationResult<ModEventAcknowledge>
 }
 
 export interface ModEventEscalate {
@@ -320,16 +326,17 @@ export interface ModEventEscalate {
   [k: string]: unknown
 }
 
-export function isModEventEscalate(v: unknown): v is ModEventEscalate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEscalate'
-  )
+export function isModEventEscalate(v: unknown): v is ModEventEscalate & {
+  $type: 'tools.ozone.moderation.defs#modEventEscalate'
+} {
+  return is$typed(v, id, 'modEventEscalate')
 }
 
-export function validateModEventEscalate(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEscalate', v)
+export function validateModEventEscalate(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEscalate`,
+    v,
+  ) as ValidationResult<ModEventEscalate>
 }
 
 /** Mute incoming reports on a subject */
@@ -340,16 +347,17 @@ export interface ModEventMute {
   [k: string]: unknown
 }
 
-export function isModEventMute(v: unknown): v is ModEventMute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMute'
-  )
+export function isModEventMute(
+  v: unknown,
+): v is ModEventMute & { $type: 'tools.ozone.moderation.defs#modEventMute' } {
+  return is$typed(v, id, 'modEventMute')
 }
 
-export function validateModEventMute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventMute', v)
+export function validateModEventMute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventMute`,
+    v,
+  ) as ValidationResult<ModEventMute>
 }
 
 /** Unmute action on a subject */
@@ -359,16 +367,17 @@ export interface ModEventUnmute {
   [k: string]: unknown
 }
 
-export function isModEventUnmute(v: unknown): v is ModEventUnmute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmute'
-  )
+export function isModEventUnmute(v: unknown): v is ModEventUnmute & {
+  $type: 'tools.ozone.moderation.defs#modEventUnmute'
+} {
+  return is$typed(v, id, 'modEventUnmute')
 }
 
-export function validateModEventUnmute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventUnmute', v)
+export function validateModEventUnmute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventUnmute`,
+    v,
+  ) as ValidationResult<ModEventUnmute>
 }
 
 /** Mute incoming reports from an account */
@@ -379,19 +388,19 @@ export interface ModEventMuteReporter {
   [k: string]: unknown
 }
 
-export function isModEventMuteReporter(v: unknown): v is ModEventMuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMuteReporter'
-  )
+export function isModEventMuteReporter(
+  v: unknown,
+): v is ModEventMuteReporter & {
+  $type: 'tools.ozone.moderation.defs#modEventMuteReporter'
+} {
+  return is$typed(v, id, 'modEventMuteReporter')
 }
 
-export function validateModEventMuteReporter(v: unknown): ValidationResult {
+export function validateModEventMuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventMuteReporter',
+    `${id}#modEventMuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventMuteReporter>
 }
 
 /** Unmute incoming reports from an account */
@@ -403,19 +412,17 @@ export interface ModEventUnmuteReporter {
 
 export function isModEventUnmuteReporter(
   v: unknown,
-): v is ModEventUnmuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmuteReporter'
-  )
+): v is ModEventUnmuteReporter & {
+  $type: 'tools.ozone.moderation.defs#modEventUnmuteReporter'
+} {
+  return is$typed(v, id, 'modEventUnmuteReporter')
 }
 
-export function validateModEventUnmuteReporter(v: unknown): ValidationResult {
+export function validateModEventUnmuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventUnmuteReporter',
+    `${id}#modEventUnmuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventUnmuteReporter>
 }
 
 /** Keep a log of outgoing email to a user */
@@ -429,16 +436,17 @@ export interface ModEventEmail {
   [k: string]: unknown
 }
 
-export function isModEventEmail(v: unknown): v is ModEventEmail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEmail'
-  )
+export function isModEventEmail(
+  v: unknown,
+): v is ModEventEmail & { $type: 'tools.ozone.moderation.defs#modEventEmail' } {
+  return is$typed(v, id, 'modEventEmail')
 }
 
-export function validateModEventEmail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEmail', v)
+export function validateModEventEmail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEmail`,
+    v,
+  ) as ValidationResult<ModEventEmail>
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
@@ -447,16 +455,17 @@ export interface ModEventDivert {
   [k: string]: unknown
 }
 
-export function isModEventDivert(v: unknown): v is ModEventDivert {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventDivert'
-  )
+export function isModEventDivert(v: unknown): v is ModEventDivert & {
+  $type: 'tools.ozone.moderation.defs#modEventDivert'
+} {
+  return is$typed(v, id, 'modEventDivert')
 }
 
-export function validateModEventDivert(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventDivert', v)
+export function validateModEventDivert(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventDivert`,
+    v,
+  ) as ValidationResult<ModEventDivert>
 }
 
 /** Add/Remove a tag on a subject */
@@ -470,16 +479,17 @@ export interface ModEventTag {
   [k: string]: unknown
 }
 
-export function isModEventTag(v: unknown): v is ModEventTag {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTag'
-  )
+export function isModEventTag(
+  v: unknown,
+): v is ModEventTag & { $type: 'tools.ozone.moderation.defs#modEventTag' } {
+  return is$typed(v, id, 'modEventTag')
 }
 
-export function validateModEventTag(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTag', v)
+export function validateModEventTag(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTag`,
+    v,
+  ) as ValidationResult<ModEventTag>
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -499,16 +509,17 @@ export interface AccountEvent {
   [k: string]: unknown
 }
 
-export function isAccountEvent(v: unknown): v is AccountEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountEvent'
-  )
+export function isAccountEvent(
+  v: unknown,
+): v is AccountEvent & { $type: 'tools.ozone.moderation.defs#accountEvent' } {
+  return is$typed(v, id, 'accountEvent')
 }
 
-export function validateAccountEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountEvent', v)
+export function validateAccountEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountEvent`,
+    v,
+  ) as ValidationResult<AccountEvent>
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -521,16 +532,17 @@ export interface IdentityEvent {
   [k: string]: unknown
 }
 
-export function isIdentityEvent(v: unknown): v is IdentityEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#identityEvent'
-  )
+export function isIdentityEvent(
+  v: unknown,
+): v is IdentityEvent & { $type: 'tools.ozone.moderation.defs#identityEvent' } {
+  return is$typed(v, id, 'identityEvent')
 }
 
-export function validateIdentityEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#identityEvent', v)
+export function validateIdentityEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#identityEvent`,
+    v,
+  ) as ValidationResult<IdentityEvent>
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -542,16 +554,17 @@ export interface RecordEvent {
   [k: string]: unknown
 }
 
-export function isRecordEvent(v: unknown): v is RecordEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordEvent'
-  )
+export function isRecordEvent(
+  v: unknown,
+): v is RecordEvent & { $type: 'tools.ozone.moderation.defs#recordEvent' } {
+  return is$typed(v, id, 'recordEvent')
 }
 
-export function validateRecordEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordEvent', v)
+export function validateRecordEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordEvent`,
+    v,
+  ) as ValidationResult<RecordEvent>
 }
 
 export interface RepoView {
@@ -569,16 +582,14 @@ export interface RepoView {
   [k: string]: unknown
 }
 
-export function isRepoView(v: unknown): v is RepoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoView'
-  )
+export function isRepoView(
+  v: unknown,
+): v is RepoView & { $type: 'tools.ozone.moderation.defs#repoView' } {
+  return is$typed(v, id, 'repoView')
 }
 
-export function validateRepoView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoView', v)
+export function validateRepoView(v: unknown) {
+  return lexicons.validate(`${id}#repoView`, v) as ValidationResult<RepoView>
 }
 
 export interface RepoViewDetail {
@@ -599,16 +610,17 @@ export interface RepoViewDetail {
   [k: string]: unknown
 }
 
-export function isRepoViewDetail(v: unknown): v is RepoViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewDetail'
-  )
+export function isRepoViewDetail(v: unknown): v is RepoViewDetail & {
+  $type: 'tools.ozone.moderation.defs#repoViewDetail'
+} {
+  return is$typed(v, id, 'repoViewDetail')
 }
 
-export function validateRepoViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewDetail', v)
+export function validateRepoViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewDetail`,
+    v,
+  ) as ValidationResult<RepoViewDetail>
 }
 
 export interface RepoViewNotFound {
@@ -616,16 +628,17 @@ export interface RepoViewNotFound {
   [k: string]: unknown
 }
 
-export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewNotFound'
-  )
+export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound & {
+  $type: 'tools.ozone.moderation.defs#repoViewNotFound'
+} {
+  return is$typed(v, id, 'repoViewNotFound')
 }
 
-export function validateRepoViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewNotFound', v)
+export function validateRepoViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewNotFound`,
+    v,
+  ) as ValidationResult<RepoViewNotFound>
 }
 
 export interface RecordView {
@@ -639,16 +652,17 @@ export interface RecordView {
   [k: string]: unknown
 }
 
-export function isRecordView(v: unknown): v is RecordView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordView'
-  )
+export function isRecordView(
+  v: unknown,
+): v is RecordView & { $type: 'tools.ozone.moderation.defs#recordView' } {
+  return is$typed(v, id, 'recordView')
 }
 
-export function validateRecordView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordView', v)
+export function validateRecordView(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordView`,
+    v,
+  ) as ValidationResult<RecordView>
 }
 
 export interface RecordViewDetail {
@@ -663,16 +677,17 @@ export interface RecordViewDetail {
   [k: string]: unknown
 }
 
-export function isRecordViewDetail(v: unknown): v is RecordViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewDetail'
-  )
+export function isRecordViewDetail(v: unknown): v is RecordViewDetail & {
+  $type: 'tools.ozone.moderation.defs#recordViewDetail'
+} {
+  return is$typed(v, id, 'recordViewDetail')
 }
 
-export function validateRecordViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewDetail', v)
+export function validateRecordViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewDetail`,
+    v,
+  ) as ValidationResult<RecordViewDetail>
 }
 
 export interface RecordViewNotFound {
@@ -680,16 +695,17 @@ export interface RecordViewNotFound {
   [k: string]: unknown
 }
 
-export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewNotFound'
-  )
+export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound & {
+  $type: 'tools.ozone.moderation.defs#recordViewNotFound'
+} {
+  return is$typed(v, id, 'recordViewNotFound')
 }
 
-export function validateRecordViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewNotFound', v)
+export function validateRecordViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewNotFound`,
+    v,
+  ) as ValidationResult<RecordViewNotFound>
 }
 
 export interface Moderation {
@@ -697,16 +713,17 @@ export interface Moderation {
   [k: string]: unknown
 }
 
-export function isModeration(v: unknown): v is Moderation {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderation'
-  )
+export function isModeration(
+  v: unknown,
+): v is Moderation & { $type: 'tools.ozone.moderation.defs#moderation' } {
+  return is$typed(v, id, 'moderation')
 }
 
-export function validateModeration(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderation', v)
+export function validateModeration(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderation`,
+    v,
+  ) as ValidationResult<Moderation>
 }
 
 export interface ModerationDetail {
@@ -714,16 +731,17 @@ export interface ModerationDetail {
   [k: string]: unknown
 }
 
-export function isModerationDetail(v: unknown): v is ModerationDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderationDetail'
-  )
+export function isModerationDetail(v: unknown): v is ModerationDetail & {
+  $type: 'tools.ozone.moderation.defs#moderationDetail'
+} {
+  return is$typed(v, id, 'moderationDetail')
 }
 
-export function validateModerationDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderationDetail', v)
+export function validateModerationDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderationDetail`,
+    v,
+  ) as ValidationResult<ModerationDetail>
 }
 
 export interface BlobView {
@@ -739,16 +757,14 @@ export interface BlobView {
   [k: string]: unknown
 }
 
-export function isBlobView(v: unknown): v is BlobView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#blobView'
-  )
+export function isBlobView(
+  v: unknown,
+): v is BlobView & { $type: 'tools.ozone.moderation.defs#blobView' } {
+  return is$typed(v, id, 'blobView')
 }
 
-export function validateBlobView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#blobView', v)
+export function validateBlobView(v: unknown) {
+  return lexicons.validate(`${id}#blobView`, v) as ValidationResult<BlobView>
 }
 
 export interface ImageDetails {
@@ -757,16 +773,17 @@ export interface ImageDetails {
   [k: string]: unknown
 }
 
-export function isImageDetails(v: unknown): v is ImageDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#imageDetails'
-  )
+export function isImageDetails(
+  v: unknown,
+): v is ImageDetails & { $type: 'tools.ozone.moderation.defs#imageDetails' } {
+  return is$typed(v, id, 'imageDetails')
 }
 
-export function validateImageDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#imageDetails', v)
+export function validateImageDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#imageDetails`,
+    v,
+  ) as ValidationResult<ImageDetails>
 }
 
 export interface VideoDetails {
@@ -776,16 +793,17 @@ export interface VideoDetails {
   [k: string]: unknown
 }
 
-export function isVideoDetails(v: unknown): v is VideoDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#videoDetails'
-  )
+export function isVideoDetails(
+  v: unknown,
+): v is VideoDetails & { $type: 'tools.ozone.moderation.defs#videoDetails' } {
+  return is$typed(v, id, 'videoDetails')
 }
 
-export function validateVideoDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#videoDetails', v)
+export function validateVideoDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#videoDetails`,
+    v,
+  ) as ValidationResult<VideoDetails>
 }
 
 export interface AccountHosting {
@@ -804,16 +822,17 @@ export interface AccountHosting {
   [k: string]: unknown
 }
 
-export function isAccountHosting(v: unknown): v is AccountHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountHosting'
-  )
+export function isAccountHosting(v: unknown): v is AccountHosting & {
+  $type: 'tools.ozone.moderation.defs#accountHosting'
+} {
+  return is$typed(v, id, 'accountHosting')
 }
 
-export function validateAccountHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountHosting', v)
+export function validateAccountHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountHosting`,
+    v,
+  ) as ValidationResult<AccountHosting>
 }
 
 export interface RecordHosting {
@@ -824,14 +843,15 @@ export interface RecordHosting {
   [k: string]: unknown
 }
 
-export function isRecordHosting(v: unknown): v is RecordHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordHosting'
-  )
+export function isRecordHosting(
+  v: unknown,
+): v is RecordHosting & { $type: 'tools.ozone.moderation.defs#recordHosting' } {
+  return is$typed(v, id, 'recordHosting')
 }
 
-export function validateRecordHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordHosting', v)
+export function validateRecordHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordHosting`,
+    v,
+  ) as ValidationResult<RecordHosting>
 }
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 1399cf589ee..c98e8903e06 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -3,14 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } 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'
 
+export const id = 'tools.ozone.moderation.emitEvent'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b583510a791..ec2cc8e7b69 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getEvent'
+
 export interface QueryParams {
   id: number
 }
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 a3832cd161c..856c13075b4 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRecord'
+
 export interface QueryParams {
   uri: string
   cid?: string
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 2559727bd65..3688826805d 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRecords'
+
 export interface QueryParams {
   uris: string[]
 }
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 853d6460e85..0b8f206cd3b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRepo'
+
 export interface QueryParams {
   did: string
 }
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 71da4d1bac9..a5a6596621b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRepos'
+
 export interface QueryParams {
   dids: string[]
 }
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 752fe333f0b..856eebf5a1f 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.queryEvents'
+
 export interface QueryParams {
   /** The types of events (fully qualified string in the format of tools.ozone.moderation.defs#modEvent<name>) to filter by. If not specified, all events are returned. */
   types?: string[]
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 f1d5bb61690..cd760b73a2b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.queryStatuses'
+
 export interface QueryParams {
   /** All subjects, or subjects from given 'collections' param, belonging to the account specified in the 'subject' param will be returned. */
   includeAllUserRecords?: boolean
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 7696df54d0f..e3529428e6e 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.searchRepos'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead */
   term?: string
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 b05ce4246d9..1207767dd7f 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.server.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -51,16 +53,17 @@ export interface ServiceConfig {
   [k: string]: unknown
 }
 
-export function isServiceConfig(v: unknown): v is ServiceConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#serviceConfig'
-  )
+export function isServiceConfig(v: unknown): v is ServiceConfig & {
+  $type: 'tools.ozone.server.getConfig#serviceConfig'
+} {
+  return is$typed(v, id, 'serviceConfig')
 }
 
-export function validateServiceConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#serviceConfig', v)
+export function validateServiceConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#serviceConfig`,
+    v,
+  ) as ValidationResult<ServiceConfig>
 }
 
 export interface ViewerConfig {
@@ -72,14 +75,15 @@ export interface ViewerConfig {
   [k: string]: unknown
 }
 
-export function isViewerConfig(v: unknown): v is ViewerConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#viewerConfig'
-  )
+export function isViewerConfig(
+  v: unknown,
+): v is ViewerConfig & { $type: 'tools.ozone.server.getConfig#viewerConfig' } {
+  return is$typed(v, id, 'viewerConfig')
 }
 
-export function validateViewerConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#viewerConfig', v)
+export function validateViewerConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerConfig`,
+    v,
+  ) as ValidationResult<ViewerConfig>
 }
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 1a48da4e682..b637035c486 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.set.addValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 4256bf8a90f..acf53bd0822 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'tools.ozone.set.defs'
 
 export interface Set {
   name: string
@@ -12,14 +14,14 @@ export interface Set {
   [k: string]: unknown
 }
 
-export function isSet(v: unknown): v is Set {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'tools.ozone.set.defs#set'
-  )
+export function isSet(
+  v: unknown,
+): v is Set & { $type: 'tools.ozone.set.defs#set' } {
+  return is$typed(v, id, 'set')
 }
 
-export function validateSet(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#set', v)
+export function validateSet(v: unknown) {
+  return lexicons.validate(`${id}#set`, v) as ValidationResult<Set>
 }
 
 export interface SetView {
@@ -31,14 +33,12 @@ export interface SetView {
   [k: string]: unknown
 }
 
-export function isSetView(v: unknown): v is SetView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.set.defs#setView'
-  )
+export function isSetView(
+  v: unknown,
+): v is SetView & { $type: 'tools.ozone.set.defs#setView' } {
+  return is$typed(v, id, 'setView')
 }
 
-export function validateSetView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#setView', v)
+export function validateSetView(v: unknown) {
+  return lexicons.validate(`${id}#setView`, v) as ValidationResult<SetView>
 }
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 8b1584c3a1a..80958b6a57a 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.set.deleteSet'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 d1090863925..c94f7cf6121 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.set.deleteValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 abae3c0b33a..eeca0ee7e7d 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+export const id = 'tools.ozone.set.getValues'
+
 export interface QueryParams {
   name: string
   limit: number
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 1eea93a7c4c..cdec980e6d7 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+export const id = 'tools.ozone.set.querySets'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 f51e375e425..d8455bb69d2 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+export const id = 'tools.ozone.set.upsertSet'
+
 export interface QueryParams {}
 
 export type InputSchema = ToolsOzoneSetDefs.Set
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 8a87cbb0e24..8c1f6b1eaa2 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'tools.ozone.setting.defs'
 
 export interface Option {
   key: string
@@ -24,14 +26,12 @@ export interface Option {
   [k: string]: unknown
 }
 
-export function isOption(v: unknown): v is Option {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.setting.defs#option'
-  )
+export function isOption(
+  v: unknown,
+): v is Option & { $type: 'tools.ozone.setting.defs#option' } {
+  return is$typed(v, id, 'option')
 }
 
-export function validateOption(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.setting.defs#option', v)
+export function validateOption(v: unknown) {
+  return lexicons.validate(`${id}#option`, v) as ValidationResult<Option>
 }
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 54ad9608df3..3c1fa7d8749 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSettingDefs from './defs'
 
+export const id = 'tools.ozone.setting.listOptions'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 1d653b314da..d6f918c7223 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.setting.removeOptions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b2e66d073d9..355cc456a8b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSettingDefs from './defs'
 
+export const id = 'tools.ozone.setting.upsertOption'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 2c9d9604aaa..5b42a7ea749 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
   property: string
@@ -12,14 +14,12 @@ export interface SigDetail {
   [k: string]: unknown
 }
 
-export function isSigDetail(v: unknown): v is SigDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.defs#sigDetail'
-  )
+export function isSigDetail(
+  v: unknown,
+): v is SigDetail & { $type: 'tools.ozone.signature.defs#sigDetail' } {
+  return is$typed(v, id, 'sigDetail')
 }
 
-export function validateSigDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.signature.defs#sigDetail', v)
+export function validateSigDetail(v: unknown) {
+  return lexicons.validate(`${id}#sigDetail`, v) as ValidationResult<SigDetail>
 }
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 c3eced05a5e..1f7fb74a74c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+export const id = 'tools.ozone.signature.findCorrelation'
+
 export interface QueryParams {
   dids: string[]
 }
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 821d5c6c080..e82445fa52c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+export const id = 'tools.ozone.signature.findRelatedAccounts'
+
 export interface QueryParams {
   did: string
   cursor?: string
@@ -55,17 +57,15 @@ export interface RelatedAccount {
   [k: string]: unknown
 }
 
-export function isRelatedAccount(v: unknown): v is RelatedAccount {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
-  )
+export function isRelatedAccount(v: unknown): v is RelatedAccount & {
+  $type: 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
+} {
+  return is$typed(v, id, 'relatedAccount')
 }
 
-export function validateRelatedAccount(v: unknown): ValidationResult {
+export function validateRelatedAccount(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.signature.findRelatedAccounts#relatedAccount',
+    `${id}#relatedAccount`,
     v,
-  )
+  ) as ValidationResult<RelatedAccount>
 }
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 4e37745aa4a..138a1170aaa 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 
+export const id = 'tools.ozone.signature.searchAccounts'
+
 export interface QueryParams {
   values: string[]
   cursor?: string
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 85e40f2a461..3fe8c2efcce 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+export const id = 'tools.ozone.team.addMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b670ecc0a70..d628e8add2c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 
+export const id = 'tools.ozone.team.defs'
+
 export interface Member {
   did: string
   disabled?: boolean
@@ -22,16 +24,14 @@ export interface Member {
   [k: string]: unknown
 }
 
-export function isMember(v: unknown): v is Member {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.team.defs#member'
-  )
+export function isMember(
+  v: unknown,
+): v is Member & { $type: 'tools.ozone.team.defs#member' } {
+  return is$typed(v, id, 'member')
 }
 
-export function validateMember(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.team.defs#member', v)
+export function validateMember(v: unknown) {
+  return lexicons.validate(`${id}#member`, v) as ValidationResult<Member>
 }
 
 /** 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 3adf03313dc..99eb7a25b20 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.team.deleteMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 1995cc68cc1..e2e6d998783 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+export const id = 'tools.ozone.team.listMembers'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 57b0a318583..32b9ca7ae5e 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+export const id = 'tools.ozone.team.updateMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/util.ts b/packages/ozone/src/lexicon/util.ts
index d7e70440d6e..e76328e680e 100644
--- a/packages/ozone/src/lexicon/util.ts
+++ b/packages/ozone/src/lexicon/util.ts
@@ -1,13 +1,35 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+export type $Type<Id extends string, Hash extends string> =
+  | (Hash extends 'main' ? Id : never)
+  | `${Id}#${Hash}`
+
+function has$type<V>(v: V): v is V & object & { $type: unknown } {
+  return v != null && typeof v === 'object' && '$type' in v
+}
+
+function check$type<Id extends string, Hash extends string>(
+  $type: unknown,
+  id: Id,
+  hash: Hash,
+): $type is $Type<Id, Hash> {
+  return (
+    typeof $type === 'string' &&
+    ($type === id
+      ? hash === 'main'
+      : // $type === `${id}#${hash}`
+        $type.length === id.length + 1 + hash.length &&
+        $type[id.length] === '#' &&
+        $type.startsWith(id) &&
+        $type.endsWith(hash))
+  )
 }
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+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)
 }
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 97b51e14312..60f3c475a23 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
 
+export const id = 'app.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,16 +23,17 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(
+  v: unknown,
+): v is ProfileViewBasic & { $type: 'app.bsky.actor.defs#profileViewBasic' } {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
 
 export interface ProfileView {
@@ -47,16 +50,17 @@ export interface ProfileView {
   [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+export function isProfileView(
+  v: unknown,
+): v is ProfileView & { $type: 'app.bsky.actor.defs#profileView' } {
+  return is$typed(v, id, 'profileView')
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileView`,
+    v,
+  ) as ValidationResult<ProfileView>
 }
 
 export interface ProfileViewDetailed {
@@ -79,16 +83,17 @@ export interface ProfileViewDetailed {
   [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed & {
+  $type: 'app.bsky.actor.defs#profileViewDetailed'
+} {
+  return is$typed(v, id, 'profileViewDetailed')
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewDetailed`,
+    v,
+  ) as ValidationResult<ProfileViewDetailed>
 }
 
 export interface ProfileAssociated {
@@ -100,16 +105,17 @@ export interface ProfileAssociated {
   [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+export function isProfileAssociated(
+  v: unknown,
+): v is ProfileAssociated & { $type: 'app.bsky.actor.defs#profileAssociated' } {
+  return is$typed(v, id, 'profileAssociated')
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociated`,
+    v,
+  ) as ValidationResult<ProfileAssociated>
 }
 
 export interface ProfileAssociatedChat {
@@ -119,16 +125,17 @@ export interface ProfileAssociatedChat {
 
 export function isProfileAssociatedChat(
   v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+): v is ProfileAssociatedChat & {
+  $type: 'app.bsky.actor.defs#profileAssociatedChat'
+} {
+  return is$typed(v, id, 'profileAssociatedChat')
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociatedChat`,
+    v,
+  ) as ValidationResult<ProfileAssociatedChat>
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
@@ -144,16 +151,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: 'app.bsky.actor.defs#viewerState' } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 /** The subject's followers whom you also follow */
@@ -163,16 +171,17 @@ export interface KnownFollowers {
   [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+export function isKnownFollowers(
+  v: unknown,
+): v is KnownFollowers & { $type: 'app.bsky.actor.defs#knownFollowers' } {
+  return is$typed(v, id, 'knownFollowers')
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers(v: unknown) {
+  return lexicons.validate(
+    `${id}#knownFollowers`,
+    v,
+  ) as ValidationResult<KnownFollowers>
 }
 
 export type Preferences = (
@@ -196,16 +205,17 @@ export interface AdultContentPref {
   [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+export function isAdultContentPref(
+  v: unknown,
+): v is AdultContentPref & { $type: 'app.bsky.actor.defs#adultContentPref' } {
+  return is$typed(v, id, 'adultContentPref')
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#adultContentPref`,
+    v,
+  ) as ValidationResult<AdultContentPref>
 }
 
 export interface ContentLabelPref {
@@ -216,16 +226,17 @@ export interface ContentLabelPref {
   [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+export function isContentLabelPref(
+  v: unknown,
+): v is ContentLabelPref & { $type: 'app.bsky.actor.defs#contentLabelPref' } {
+  return is$typed(v, id, 'contentLabelPref')
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#contentLabelPref`,
+    v,
+  ) as ValidationResult<ContentLabelPref>
 }
 
 export interface SavedFeed {
@@ -236,16 +247,14 @@ export interface SavedFeed {
   [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+export function isSavedFeed(
+  v: unknown,
+): v is SavedFeed & { $type: 'app.bsky.actor.defs#savedFeed' } {
+  return is$typed(v, id, 'savedFeed')
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed(v: unknown) {
+  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
 }
 
 export interface SavedFeedsPrefV2 {
@@ -253,16 +262,17 @@ export interface SavedFeedsPrefV2 {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+export function isSavedFeedsPrefV2(
+  v: unknown,
+): v is SavedFeedsPrefV2 & { $type: 'app.bsky.actor.defs#savedFeedsPrefV2' } {
+  return is$typed(v, id, 'savedFeedsPrefV2')
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPrefV2`,
+    v,
+  ) as ValidationResult<SavedFeedsPrefV2>
 }
 
 export interface SavedFeedsPref {
@@ -272,16 +282,17 @@ export interface SavedFeedsPref {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+export function isSavedFeedsPref(
+  v: unknown,
+): v is SavedFeedsPref & { $type: 'app.bsky.actor.defs#savedFeedsPref' } {
+  return is$typed(v, id, 'savedFeedsPref')
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPref`,
+    v,
+  ) as ValidationResult<SavedFeedsPref>
 }
 
 export interface PersonalDetailsPref {
@@ -290,16 +301,17 @@ export interface PersonalDetailsPref {
   [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref & {
+  $type: 'app.bsky.actor.defs#personalDetailsPref'
+} {
+  return is$typed(v, id, 'personalDetailsPref')
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#personalDetailsPref`,
+    v,
+  ) as ValidationResult<PersonalDetailsPref>
 }
 
 export interface FeedViewPref {
@@ -318,16 +330,17 @@ export interface FeedViewPref {
   [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+export function isFeedViewPref(
+  v: unknown,
+): v is FeedViewPref & { $type: 'app.bsky.actor.defs#feedViewPref' } {
+  return is$typed(v, id, 'feedViewPref')
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPref`,
+    v,
+  ) as ValidationResult<FeedViewPref>
 }
 
 export interface ThreadViewPref {
@@ -338,16 +351,17 @@ export interface ThreadViewPref {
   [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+export function isThreadViewPref(
+  v: unknown,
+): v is ThreadViewPref & { $type: 'app.bsky.actor.defs#threadViewPref' } {
+  return is$typed(v, id, 'threadViewPref')
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPref`,
+    v,
+  ) as ValidationResult<ThreadViewPref>
 }
 
 export interface InterestsPref {
@@ -356,16 +370,17 @@ export interface InterestsPref {
   [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+export function isInterestsPref(
+  v: unknown,
+): v is InterestsPref & { $type: 'app.bsky.actor.defs#interestsPref' } {
+  return is$typed(v, id, 'interestsPref')
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#interestsPref`,
+    v,
+  ) as ValidationResult<InterestsPref>
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
@@ -384,16 +399,14 @@ export interface MutedWord {
   [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+export function isMutedWord(
+  v: unknown,
+): v is MutedWord & { $type: 'app.bsky.actor.defs#mutedWord' } {
+  return is$typed(v, id, 'mutedWord')
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord(v: unknown) {
+  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
 }
 
 export interface MutedWordsPref {
@@ -402,16 +415,17 @@ export interface MutedWordsPref {
   [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+export function isMutedWordsPref(
+  v: unknown,
+): v is MutedWordsPref & { $type: 'app.bsky.actor.defs#mutedWordsPref' } {
+  return is$typed(v, id, 'mutedWordsPref')
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#mutedWordsPref`,
+    v,
+  ) as ValidationResult<MutedWordsPref>
 }
 
 export interface HiddenPostsPref {
@@ -420,16 +434,17 @@ export interface HiddenPostsPref {
   [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+export function isHiddenPostsPref(
+  v: unknown,
+): v is HiddenPostsPref & { $type: 'app.bsky.actor.defs#hiddenPostsPref' } {
+  return is$typed(v, id, 'hiddenPostsPref')
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#hiddenPostsPref`,
+    v,
+  ) as ValidationResult<HiddenPostsPref>
 }
 
 export interface LabelersPref {
@@ -437,16 +452,17 @@ export interface LabelersPref {
   [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+export function isLabelersPref(
+  v: unknown,
+): v is LabelersPref & { $type: 'app.bsky.actor.defs#labelersPref' } {
+  return is$typed(v, id, 'labelersPref')
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelersPref`,
+    v,
+  ) as ValidationResult<LabelersPref>
 }
 
 export interface LabelerPrefItem {
@@ -454,16 +470,17 @@ export interface LabelerPrefItem {
   [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+export function isLabelerPrefItem(
+  v: unknown,
+): v is LabelerPrefItem & { $type: 'app.bsky.actor.defs#labelerPrefItem' } {
+  return is$typed(v, id, 'labelerPrefItem')
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPrefItem`,
+    v,
+  ) as ValidationResult<LabelerPrefItem>
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
@@ -476,16 +493,17 @@ export interface BskyAppStatePref {
   [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+export function isBskyAppStatePref(
+  v: unknown,
+): v is BskyAppStatePref & { $type: 'app.bsky.actor.defs#bskyAppStatePref' } {
+  return is$typed(v, id, 'bskyAppStatePref')
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppStatePref`,
+    v,
+  ) as ValidationResult<BskyAppStatePref>
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
@@ -494,16 +512,19 @@ export interface BskyAppProgressGuide {
   [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+export function isBskyAppProgressGuide(
+  v: unknown,
+): v is BskyAppProgressGuide & {
+  $type: 'app.bsky.actor.defs#bskyAppProgressGuide'
+} {
+  return is$typed(v, id, 'bskyAppProgressGuide')
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppProgressGuide`,
+    v,
+  ) as ValidationResult<BskyAppProgressGuide>
 }
 
 /** A new user experiences (NUX) storage object */
@@ -517,12 +538,12 @@ export interface Nux {
   [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+export function isNux(
+  v: unknown,
+): v is Nux & { $type: 'app.bsky.actor.defs#nux' } {
+  return is$typed(v, id, 'nux')
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux(v: unknown) {
+  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
 }
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 305e80484be..cbcb8d9d0b1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getPreferences'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 5a7b1f25bfc..816ff0aa928 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getProfile'
+
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
   actor: string
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 16438505654..d4d16137bab 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getProfiles'
+
 export interface QueryParams {
   actors: string[]
 }
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 33b89a18bfa..3e2eca1d6d9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.getSuggestions'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 617bdf2cd73..16dd8c0af0d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.actor.profile'
+
 export interface Record {
   displayName?: string
   /** Free-form profile description text. */
@@ -25,15 +27,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.actor.profile#main' | 'app.bsky.actor.profile'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 670e752fea3..84ac22b7b70 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 dcda0c41854..c41d5dc325d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.searchActors'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
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 0198b23d790..976470008a5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+export const id = 'app.bsky.actor.searchActorsTypeahead'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
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 cc253f9e610..643f349a328 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export 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 {
@@ -13,14 +15,15 @@ export interface AspectRatio {
   [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+export function isAspectRatio(
+  v: unknown,
+): v is AspectRatio & { $type: 'app.bsky.embed.defs#aspectRatio' } {
+  return is$typed(v, id, 'aspectRatio')
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio(v: unknown) {
+  return lexicons.validate(
+    `${id}#aspectRatio`,
+    v,
+  ) as ValidationResult<AspectRatio>
 }
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 b137ee4b6f5..57c16c40070 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export 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 {
@@ -12,17 +14,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.external#main' | 'app.bsky.embed.external'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface External {
@@ -33,16 +32,14 @@ export interface External {
   [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+export function isExternal(
+  v: unknown,
+): v is External & { $type: 'app.bsky.embed.external#external' } {
+  return is$typed(v, id, 'external')
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal(v: unknown) {
+  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
 }
 
 export interface View {
@@ -50,16 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.external#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewExternal {
@@ -70,14 +65,15 @@ export interface ViewExternal {
   [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+export function isViewExternal(
+  v: unknown,
+): v is ViewExternal & { $type: 'app.bsky.embed.external#viewExternal' } {
+  return is$typed(v, id, 'viewExternal')
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewExternal`,
+    v,
+  ) as ValidationResult<ViewExternal>
 }
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 1fddf42f8eb..fd605b3aa24 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
@@ -2,27 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+export const id = 'app.bsky.embed.images'
+
 export interface Main {
   images: Image[]
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.images#main' | 'app.bsky.embed.images'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Image {
@@ -33,14 +32,14 @@ export interface Image {
   [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+export function isImage(
+  v: unknown,
+): v is Image & { $type: 'app.bsky.embed.images#image' } {
+  return is$typed(v, id, 'image')
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage(v: unknown) {
+  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.images#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewImage {
@@ -69,14 +68,12 @@ export interface ViewImage {
   [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+export function isViewImage(
+  v: unknown,
+): v is ViewImage & { $type: 'app.bsky.embed.images#viewImage' } {
+  return is$typed(v, id, 'viewImage')
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage(v: unknown) {
+  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
 }
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 452c8fb7f71..a7a844f60e3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as AppBskyFeedDefs from '../feed/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
@@ -16,22 +16,21 @@ import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
 
+export const id = 'app.bsky.embed.record'
+
 export interface Main {
   record: ComAtprotoRepoStrongRef.Main
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.embed.record#main' | 'app.bsky.embed.record'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.record#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewRecord {
@@ -81,16 +80,17 @@ export interface ViewRecord {
   [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+export function isViewRecord(
+  v: unknown,
+): v is ViewRecord & { $type: 'app.bsky.embed.record#viewRecord' } {
+  return is$typed(v, id, 'viewRecord')
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewRecord`,
+    v,
+  ) as ValidationResult<ViewRecord>
 }
 
 export interface ViewNotFound {
@@ -99,16 +99,17 @@ export interface ViewNotFound {
   [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+export function isViewNotFound(
+  v: unknown,
+): v is ViewNotFound & { $type: 'app.bsky.embed.record#viewNotFound' } {
+  return is$typed(v, id, 'viewNotFound')
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewNotFound`,
+    v,
+  ) as ValidationResult<ViewNotFound>
 }
 
 export interface ViewBlocked {
@@ -118,16 +119,17 @@ export interface ViewBlocked {
   [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+export function isViewBlocked(
+  v: unknown,
+): v is ViewBlocked & { $type: 'app.bsky.embed.record#viewBlocked' } {
+  return is$typed(v, id, 'viewBlocked')
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewBlocked`,
+    v,
+  ) as ValidationResult<ViewBlocked>
 }
 
 export interface ViewDetached {
@@ -136,14 +138,15 @@ export interface ViewDetached {
   [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+export function isViewDetached(
+  v: unknown,
+): v is ViewDetached & { $type: 'app.bsky.embed.record#viewDetached' } {
+  return is$typed(v, id, 'viewDetached')
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewDetached`,
+    v,
+  ) as ValidationResult<ViewDetached>
 }
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 4df0ee5c2d7..2e9783258ce 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyEmbedRecord from './record'
 import * as AppBskyEmbedImages from './images'
 import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 
+export const id = 'app.bsky.embed.recordWithMedia'
+
 export interface Main {
   record: AppBskyEmbedRecord.Main
   media:
@@ -20,17 +22,16 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type:
+    | 'app.bsky.embed.recordWithMedia#main'
+    | 'app.bsky.embed.recordWithMedia'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -43,14 +44,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.recordWithMedia#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
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 50eb59aa038..17221841473 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+export const id = 'app.bsky.embed.video'
+
 export interface Main {
   video: BlobRef
   captions?: Caption[]
@@ -16,17 +18,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: 'app.bsky.embed.video#main' | 'app.bsky.embed.video' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Caption {
@@ -35,16 +34,14 @@ export interface Caption {
   [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+export function isCaption(
+  v: unknown,
+): v is Caption & { $type: 'app.bsky.embed.video#caption' } {
+  return is$typed(v, id, 'caption')
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption(v: unknown) {
+  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
 }
 
 export interface View {
@@ -56,12 +53,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: 'app.bsky.embed.video#view' } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
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 1c6f6ce78f6..32090d73a08 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -15,6 +15,8 @@ import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyGraphDefs from '../graph/defs'
 
+export const id = 'app.bsky.feed.defs'
+
 export interface PostView {
   uri: string
   cid: string
@@ -38,14 +40,14 @@ export interface PostView {
   [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+export function isPostView(
+  v: unknown,
+): v is PostView & { $type: 'app.bsky.feed.defs#postView' } {
+  return is$typed(v, id, 'postView')
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView(v: unknown) {
+  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
@@ -59,16 +61,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: 'app.bsky.feed.defs#viewerState' } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 export interface FeedViewPost {
@@ -80,16 +83,17 @@ export interface FeedViewPost {
   [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+export function isFeedViewPost(
+  v: unknown,
+): v is FeedViewPost & { $type: 'app.bsky.feed.defs#feedViewPost' } {
+  return is$typed(v, id, 'feedViewPost')
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPost`,
+    v,
+  ) as ValidationResult<FeedViewPost>
 }
 
 export interface ReplyRef {
@@ -107,14 +111,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: 'app.bsky.feed.defs#replyRef' } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 export interface ReasonRepost {
@@ -123,32 +127,31 @@ export interface ReasonRepost {
   [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+export function isReasonRepost(
+  v: unknown,
+): v is ReasonRepost & { $type: 'app.bsky.feed.defs#reasonRepost' } {
+  return is$typed(v, id, 'reasonRepost')
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#reasonRepost`,
+    v,
+  ) as ValidationResult<ReasonRepost>
 }
 
 export interface ReasonPin {
   [k: string]: unknown
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+export function isReasonPin(
+  v: unknown,
+): v is ReasonPin & { $type: 'app.bsky.feed.defs#reasonPin' } {
+  return is$typed(v, id, 'reasonPin')
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin(v: unknown) {
+  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
 }
 
 export interface ThreadViewPost {
@@ -167,16 +170,17 @@ export interface ThreadViewPost {
   [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+export function isThreadViewPost(
+  v: unknown,
+): v is ThreadViewPost & { $type: 'app.bsky.feed.defs#threadViewPost' } {
+  return is$typed(v, id, 'threadViewPost')
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPost`,
+    v,
+  ) as ValidationResult<ThreadViewPost>
 }
 
 export interface NotFoundPost {
@@ -185,16 +189,17 @@ export interface NotFoundPost {
   [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+export function isNotFoundPost(
+  v: unknown,
+): v is NotFoundPost & { $type: 'app.bsky.feed.defs#notFoundPost' } {
+  return is$typed(v, id, 'notFoundPost')
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundPost`,
+    v,
+  ) as ValidationResult<NotFoundPost>
 }
 
 export interface BlockedPost {
@@ -204,16 +209,17 @@ export interface BlockedPost {
   [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+export function isBlockedPost(
+  v: unknown,
+): v is BlockedPost & { $type: 'app.bsky.feed.defs#blockedPost' } {
+  return is$typed(v, id, 'blockedPost')
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedPost`,
+    v,
+  ) as ValidationResult<BlockedPost>
 }
 
 export interface BlockedAuthor {
@@ -222,16 +228,17 @@ export interface BlockedAuthor {
   [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+export function isBlockedAuthor(
+  v: unknown,
+): v is BlockedAuthor & { $type: 'app.bsky.feed.defs#blockedAuthor' } {
+  return is$typed(v, id, 'blockedAuthor')
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedAuthor`,
+    v,
+  ) as ValidationResult<BlockedAuthor>
 }
 
 export interface GeneratorView {
@@ -251,16 +258,17 @@ export interface GeneratorView {
   [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+export function isGeneratorView(
+  v: unknown,
+): v is GeneratorView & { $type: 'app.bsky.feed.defs#generatorView' } {
+  return is$typed(v, id, 'generatorView')
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorView`,
+    v,
+  ) as ValidationResult<GeneratorView>
 }
 
 export interface GeneratorViewerState {
@@ -268,16 +276,19 @@ export interface GeneratorViewerState {
   [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+export function isGeneratorViewerState(
+  v: unknown,
+): v is GeneratorViewerState & {
+  $type: 'app.bsky.feed.defs#generatorViewerState'
+} {
+  return is$typed(v, id, 'generatorViewerState')
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorViewerState`,
+    v,
+  ) as ValidationResult<GeneratorViewerState>
 }
 
 export interface SkeletonFeedPost {
@@ -291,16 +302,17 @@ export interface SkeletonFeedPost {
   [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+export function isSkeletonFeedPost(
+  v: unknown,
+): v is SkeletonFeedPost & { $type: 'app.bsky.feed.defs#skeletonFeedPost' } {
+  return is$typed(v, id, 'skeletonFeedPost')
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonFeedPost`,
+    v,
+  ) as ValidationResult<SkeletonFeedPost>
 }
 
 export interface SkeletonReasonRepost {
@@ -308,32 +320,36 @@ export interface SkeletonReasonRepost {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+export function isSkeletonReasonRepost(
+  v: unknown,
+): v is SkeletonReasonRepost & {
+  $type: 'app.bsky.feed.defs#skeletonReasonRepost'
+} {
+  return is$typed(v, id, 'skeletonReasonRepost')
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonRepost`,
+    v,
+  ) as ValidationResult<SkeletonReasonRepost>
 }
 
 export interface SkeletonReasonPin {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+export function isSkeletonReasonPin(
+  v: unknown,
+): v is SkeletonReasonPin & { $type: 'app.bsky.feed.defs#skeletonReasonPin' } {
+  return is$typed(v, id, 'skeletonReasonPin')
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonPin`,
+    v,
+  ) as ValidationResult<SkeletonReasonPin>
 }
 
 export interface ThreadgateView {
@@ -344,16 +360,17 @@ export interface ThreadgateView {
   [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+export function isThreadgateView(
+  v: unknown,
+): v is ThreadgateView & { $type: 'app.bsky.feed.defs#threadgateView' } {
+  return is$typed(v, id, 'threadgateView')
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadgateView`,
+    v,
+  ) as ValidationResult<ThreadgateView>
 }
 
 export interface Interaction {
@@ -377,16 +394,17 @@ export interface Interaction {
   [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+export function isInteraction(
+  v: unknown,
+): v is Interaction & { $type: 'app.bsky.feed.defs#interaction' } {
+  return is$typed(v, id, 'interaction')
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction(v: unknown) {
+  return lexicons.validate(
+    `${id}#interaction`,
+    v,
+  ) as ValidationResult<Interaction>
 }
 
 /** 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 5bf8699a3ca..222200a6dab 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.feed.describeFeedGenerator'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,16 +51,14 @@ export interface Feed {
   [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+export function isFeed(
+  v: unknown,
+): v is Feed & { $type: 'app.bsky.feed.describeFeedGenerator#feed' } {
+  return is$typed(v, id, 'feed')
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed(v: unknown) {
+  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
 }
 
 export interface Links {
@@ -67,14 +67,12 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: 'app.bsky.feed.describeFeedGenerator#links' } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
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 eb8e8d0f633..9aff843de0d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.feed.generator'
+
 export interface Record {
   did: string
   displayName: string
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.generator#main' | 'app.bsky.feed.generator'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 0b8afff4ec8..43550105cca 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getActorFeeds'
+
 export interface QueryParams {
   actor: string
   limit: number
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 da315ae33c7..9c6ec1f722f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getActorLikes'
+
 export interface QueryParams {
   actor: string
   limit: number
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 60fa2f74f92..5dda0b3556b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getAuthorFeed'
+
 export interface QueryParams {
   actor: string
   limit: number
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 e03913a6fb3..1d38547b6a4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeed'
+
 export interface QueryParams {
   feed: string
   limit: number
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 7ab89057a8c..1388516ab39 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedGenerator'
+
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
   feed: string
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 21963a91e2e..085b4ddb346 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedGenerators'
+
 export interface QueryParams {
   feeds: string[]
 }
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 ca1cef20f08..861533a76b7 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getFeedSkeleton'
+
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
   feed: string
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 275d99bba3d..dc21fc9d706 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.feed.getLikes'
+
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
   uri: string
@@ -60,12 +62,12 @@ export interface Like {
   [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+export function isLike(
+  v: unknown,
+): v is Like & { $type: 'app.bsky.feed.getLikes#like' } {
+  return is$typed(v, id, 'like')
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike(v: unknown) {
+  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
 }
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 84e12deaa92..d610b2bd573 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getListFeed'
+
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
   list: string
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 768977193ef..e82268ad2e6 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getPostThread'
+
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
   uri: string
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 85000c74787..709382d84fb 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getPosts'
+
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
   uris: string[]
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 38d04ad88c1..9f2bc12cd96 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getQuotes'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
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 40e008815d9..95976d204e3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.feed.getRepostedBy'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
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 d1ec590f33d..280d697a311 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getSuggestedFeeds'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 5202c9eb6e3..9a90195cc71 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.getTimeline'
+
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
   algorithm?: string
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 1da9dd940dc..08180baa5a3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
@@ -2,25 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.like'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.feed.like#main' | 'app.bsky.feed.like' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 f9f2827c8d0..991ac71ccf2 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -14,6 +14,8 @@ import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.post'
+
 export interface Record {
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
@@ -41,16 +43,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.feed.post#main' | 'app.bsky.feed.post' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface ReplyRef {
@@ -59,14 +59,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: 'app.bsky.feed.post#replyRef' } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 /** Deprecated: use facets instead. */
@@ -78,14 +78,14 @@ export interface Entity {
   [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+export function isEntity(
+  v: unknown,
+): v is Entity & { $type: 'app.bsky.feed.post#entity' } {
+  return is$typed(v, id, 'entity')
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity(v: unknown) {
+  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
@@ -95,14 +95,12 @@ export interface TextSlice {
   [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+export function isTextSlice(
+  v: unknown,
+): v is TextSlice & { $type: 'app.bsky.feed.post#textSlice' } {
+  return is$typed(v, id, 'textSlice')
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice(v: unknown) {
+  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
 }
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 dcc4c22a425..4ea1cb11f7b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.feed.postgate'
 
 export interface Record {
   createdAt: string
@@ -16,17 +18,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.postgate#main' | 'app.bsky.feed.postgate'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Disables embedding of this post. */
@@ -34,14 +33,15 @@ export interface DisableRule {
   [k: string]: unknown
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+export function isDisableRule(
+  v: unknown,
+): v is DisableRule & { $type: 'app.bsky.feed.postgate#disableRule' } {
+  return is$typed(v, id, 'disableRule')
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#disableRule`,
+    v,
+  ) as ValidationResult<DisableRule>
 }
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 4c836d76e2a..5ee8fa1cdd8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
@@ -2,26 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+export const id = 'app.bsky.feed.repost'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.repost#main' | 'app.bsky.feed.repost'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 14efa5276f8..68e6c2a887b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.searchPosts'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
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 c22fc1cb2fb..3ee83621222 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+export const id = 'app.bsky.feed.sendInteractions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 c0e618c8f53..2de0434e1ad 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
   /** Reference (AT-URI) to the post record. */
@@ -21,17 +23,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.feed.threadgate#main' | 'app.bsky.feed.threadgate'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Allow replies from actors mentioned in your post. */
@@ -39,16 +38,17 @@ export interface MentionRule {
   [k: string]: unknown
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+export function isMentionRule(
+  v: unknown,
+): v is MentionRule & { $type: 'app.bsky.feed.threadgate#mentionRule' } {
+  return is$typed(v, id, 'mentionRule')
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#mentionRule`,
+    v,
+  ) as ValidationResult<MentionRule>
 }
 
 /** Allow replies from actors you follow. */
@@ -56,16 +56,17 @@ export interface FollowingRule {
   [k: string]: unknown
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+export function isFollowingRule(
+  v: unknown,
+): v is FollowingRule & { $type: 'app.bsky.feed.threadgate#followingRule' } {
+  return is$typed(v, id, 'followingRule')
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#followingRule`,
+    v,
+  ) as ValidationResult<FollowingRule>
 }
 
 /** Allow replies from actors on a list. */
@@ -74,14 +75,12 @@ export interface ListRule {
   [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+export function isListRule(
+  v: unknown,
+): v is ListRule & { $type: 'app.bsky.feed.threadgate#listRule' } {
+  return is$typed(v, id, 'listRule')
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule(v: unknown) {
+  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
 }
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 b7f19f126b7..352cb6454ab 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.block'
 
 export interface Record {
   /** DID of the account to be blocked. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.block#main' | 'app.bsky.graph.block'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 63ecf7e00c0..8f4850ba863 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
 
+export const id = 'app.bsky.graph.defs'
+
 export interface ListViewBasic {
   uri: string
   cid: string
@@ -23,16 +25,17 @@ export interface ListViewBasic {
   [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+export function isListViewBasic(
+  v: unknown,
+): v is ListViewBasic & { $type: 'app.bsky.graph.defs#listViewBasic' } {
+  return is$typed(v, id, 'listViewBasic')
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewBasic`,
+    v,
+  ) as ValidationResult<ListViewBasic>
 }
 
 export interface ListView {
@@ -51,16 +54,14 @@ export interface ListView {
   [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+export function isListView(
+  v: unknown,
+): v is ListView & { $type: 'app.bsky.graph.defs#listView' } {
+  return is$typed(v, id, 'listView')
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView(v: unknown) {
+  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
 }
 
 export interface ListItemView {
@@ -69,16 +70,17 @@ export interface ListItemView {
   [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+export function isListItemView(
+  v: unknown,
+): v is ListItemView & { $type: 'app.bsky.graph.defs#listItemView' } {
+  return is$typed(v, id, 'listItemView')
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView(v: unknown) {
+  return lexicons.validate(
+    `${id}#listItemView`,
+    v,
+  ) as ValidationResult<ListItemView>
 }
 
 export interface StarterPackView {
@@ -96,16 +98,17 @@ export interface StarterPackView {
   [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+export function isStarterPackView(
+  v: unknown,
+): v is StarterPackView & { $type: 'app.bsky.graph.defs#starterPackView' } {
+  return is$typed(v, id, 'starterPackView')
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackView`,
+    v,
+  ) as ValidationResult<StarterPackView>
 }
 
 export interface StarterPackViewBasic {
@@ -121,16 +124,19 @@ export interface StarterPackViewBasic {
   [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+export function isStarterPackViewBasic(
+  v: unknown,
+): v is StarterPackViewBasic & {
+  $type: 'app.bsky.graph.defs#starterPackViewBasic'
+} {
+  return is$typed(v, id, 'starterPackViewBasic')
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackViewBasic`,
+    v,
+  ) as ValidationResult<StarterPackViewBasic>
 }
 
 export type ListPurpose =
@@ -152,16 +158,17 @@ export interface ListViewerState {
   [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+export function isListViewerState(
+  v: unknown,
+): v is ListViewerState & { $type: 'app.bsky.graph.defs#listViewerState' } {
+  return is$typed(v, id, 'listViewerState')
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewerState`,
+    v,
+  ) as ValidationResult<ListViewerState>
 }
 
 /** indicates that a handle or DID could not be resolved */
@@ -171,16 +178,17 @@ export interface NotFoundActor {
   [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+export function isNotFoundActor(
+  v: unknown,
+): v is NotFoundActor & { $type: 'app.bsky.graph.defs#notFoundActor' } {
+  return is$typed(v, id, 'notFoundActor')
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundActor`,
+    v,
+  ) as ValidationResult<NotFoundActor>
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
@@ -193,14 +201,15 @@ export interface Relationship {
   [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+export function isRelationship(
+  v: unknown,
+): v is Relationship & { $type: 'app.bsky.graph.defs#relationship' } {
+  return is$typed(v, id, 'relationship')
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship(v: unknown) {
+  return lexicons.validate(
+    `${id}#relationship`,
+    v,
+  ) as ValidationResult<Relationship>
 }
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 4b74a58a5df..62a91024b9d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.follow'
 
 export interface Record {
   subject: string
@@ -12,15 +14,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.follow#main' | 'app.bsky.graph.follow'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 10250d0f3b4..97e170748ba 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getActorStarterPacks'
+
 export interface QueryParams {
   actor: string
   limit: number
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 1fc9cd8ce37..897a5f4369b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 f5645eaef29..522f724a57b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
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 b9bd249da45..cd38a3ce0dc 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getFollows'
+
 export interface QueryParams {
   actor: string
   limit: number
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 f5645eaef29..f768f4641cb 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getKnownFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
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 864a81b3833..f2a28101921 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getList'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
   list: string
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 7399a14fadc..46f91ed6b70 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getListBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 7399a14fadc..e69a87f3949 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getListMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 dc0c4f18bea..f52261aab4b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getLists'
+
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
   actor: string
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 f450393522d..12cc1417996 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 bd6b6e765ed..e9e0cbe7941 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getRelationships'
+
 export interface QueryParams {
   /** Primary account requesting relationships for. */
   actor: string
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 93fe21f0b13..9a58898db30 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getStarterPack'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
   starterPack: string
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 4b9757b941e..55b817ec96e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+export const id = 'app.bsky.graph.getStarterPacks'
+
 export interface QueryParams {
   uris: string[]
 }
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 99b97e708f5..766f2ae2396 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+export const id = 'app.bsky.graph.getSuggestedFollowsByActor'
+
 export interface QueryParams {
   actor: string
 }
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 91c8ccee5bb..540745ff894 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyGraphDefs from './defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.graph.list'
+
 export interface Record {
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'app.bsky.graph.list#main' | 'app.bsky.graph.list' } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 592778c7a51..0033adb86d8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.listblock'
 
 export interface Record {
   /** Reference (AT-URI) to the mod list record. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.listblock#main' | 'app.bsky.graph.listblock'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 5e93b34a111..c8b39c67071 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.graph.listitem'
 
 export interface Record {
   /** The account which is included on the list. */
@@ -15,15 +17,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.listitem#main' | 'app.bsky.graph.listitem'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 baa9844046a..37bfa3a674e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.muteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6a68f680a1c..e741b3f2fc3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.muteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 928c56b6fc3..d8b89891f92 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.muteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 0daf8daf688..2029ef32d56 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 
+export const id = 'app.bsky.graph.starterpack'
+
 export interface Record {
   /** Display name for starter pack; can not be empty. */
   name: string
@@ -19,17 +21,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.graph.starterpack#main' | 'app.bsky.graph.starterpack'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface FeedItem {
@@ -37,14 +36,12 @@ export interface FeedItem {
   [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+export function isFeedItem(
+  v: unknown,
+): v is FeedItem & { $type: 'app.bsky.graph.starterpack#feedItem' } {
+  return is$typed(v, id, 'feedItem')
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem(v: unknown) {
+  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
 }
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 baa9844046a..70155b11deb 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.unmuteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6a68f680a1c..a436151f54f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.unmuteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 928c56b6fc3..de6d5ba74d1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.graph.unmuteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 e12c7203c57..e5e7aa2d9ba 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.labeler.defs'
+
 export interface LabelerView {
   uri: string
   cid: string
@@ -19,16 +21,17 @@ export interface LabelerView {
   [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+export function isLabelerView(
+  v: unknown,
+): v is LabelerView & { $type: 'app.bsky.labeler.defs#labelerView' } {
+  return is$typed(v, id, 'labelerView')
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerView`,
+    v,
+  ) as ValidationResult<LabelerView>
 }
 
 export interface LabelerViewDetailed {
@@ -43,16 +46,17 @@ export interface LabelerViewDetailed {
   [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed & {
+  $type: 'app.bsky.labeler.defs#labelerViewDetailed'
+} {
+  return is$typed(v, id, 'labelerViewDetailed')
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewDetailed`,
+    v,
+  ) as ValidationResult<LabelerViewDetailed>
 }
 
 export interface LabelerViewerState {
@@ -60,16 +64,17 @@ export interface LabelerViewerState {
   [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+export function isLabelerViewerState(v: unknown): v is LabelerViewerState & {
+  $type: 'app.bsky.labeler.defs#labelerViewerState'
+} {
+  return is$typed(v, id, 'labelerViewerState')
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewerState`,
+    v,
+  ) as ValidationResult<LabelerViewerState>
 }
 
 export interface LabelerPolicies {
@@ -80,14 +85,15 @@ export interface LabelerPolicies {
   [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+export function isLabelerPolicies(
+  v: unknown,
+): v is LabelerPolicies & { $type: 'app.bsky.labeler.defs#labelerPolicies' } {
+  return is$typed(v, id, 'labelerPolicies')
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPolicies`,
+    v,
+  ) as ValidationResult<LabelerPolicies>
 }
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 faeb30b4798..0f2e4e34509 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyLabelerDefs from './defs'
 
+export const id = 'app.bsky.labeler.getServices'
+
 export interface QueryParams {
   dids: string[]
   detailed: boolean
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 a044b8699b6..b510e8e58f5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyLabelerDefs from './defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.labeler.service'
+
 export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?:
@@ -17,15 +19,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'app.bsky.labeler.service#main' | 'app.bsky.labeler.service'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 3931e24d3f0..3d12fc24af9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.getUnreadCount'
+
 export interface QueryParams {
   priority?: boolean
   seenAt?: string
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 70adc412701..c930071b193 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'app.bsky.notification.listNotifications'
+
 export interface QueryParams {
   limit: number
   priority?: boolean
@@ -74,17 +76,15 @@ export interface Notification {
   [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+export function isNotification(v: unknown): v is Notification & {
+  $type: 'app.bsky.notification.listNotifications#notification'
+} {
+  return is$typed(v, id, 'notification')
 }
 
-export function validateNotification(v: unknown): ValidationResult {
+export function validateNotification(v: unknown) {
   return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
+    `${id}#notification`,
     v,
-  )
+  ) as ValidationResult<Notification>
 }
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 2c3a9d6fdbb..ef9b16d26ee 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 cce8f95839d..2a0596065a4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.registerPush'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 93db017a152..e83855b62b1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.notification.updateSeen'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 139b5382caf..706ea4a3905 100644
--- a/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
@@ -13,17 +15,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'app.bsky.richtext.facet#main' | 'app.bsky.richtext.facet'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
@@ -32,16 +31,14 @@ export interface Mention {
   [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+export function isMention(
+  v: unknown,
+): v is Mention & { $type: 'app.bsky.richtext.facet#mention' } {
+  return is$typed(v, id, 'mention')
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention(v: unknown) {
+  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
@@ -50,16 +47,14 @@ export interface Link {
   [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+export function isLink(
+  v: unknown,
+): v is Link & { $type: 'app.bsky.richtext.facet#link' } {
+  return is$typed(v, id, 'link')
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink(v: unknown) {
+  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
 }
 
 /** 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'). */
@@ -68,14 +63,14 @@ export interface Tag {
   [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+export function isTag(
+  v: unknown,
+): v is Tag & { $type: 'app.bsky.richtext.facet#tag' } {
+  return is$typed(v, id, 'tag')
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag(v: unknown) {
+  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
 }
 
 /** 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. */
@@ -85,14 +80,12 @@ export interface ByteSlice {
   [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+export function isByteSlice(
+  v: unknown,
+): v is ByteSlice & { $type: 'app.bsky.richtext.facet#byteSlice' } {
+  return is$typed(v, id, 'byteSlice')
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice(v: unknown) {
+  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
 }
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 59a6b38064c..980a3b50089 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
   uri: string
   [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost & {
+  $type: 'app.bsky.unspecced.defs#skeletonSearchPost'
+} {
+  return is$typed(v, id, 'skeletonSearchPost')
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchPost`,
+    v,
+  ) as ValidationResult<SkeletonSearchPost>
 }
 
 export interface SkeletonSearchActor {
@@ -28,14 +31,15 @@ export interface SkeletonSearchActor {
   [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor & {
+  $type: 'app.bsky.unspecced.defs#skeletonSearchActor'
+} {
+  return is$typed(v, id, 'skeletonSearchActor')
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchActor`,
+    v,
+  ) as ValidationResult<SkeletonSearchActor>
 }
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 da202ab0d54..b054827943a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.unspecced.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 02f19f3cc6a..bb5f5b19196 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+export const id = 'app.bsky.unspecced.getPopularFeedGenerators'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 b801fa34d72..7ec896318cb 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
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 a03f442140d..0e67f7c3a65 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.unspecced.getTaggedSuggestions'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,17 +51,15 @@ export interface Suggestion {
   [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+export function isSuggestion(v: unknown): v is Suggestion & {
+  $type: 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
+} {
+  return is$typed(v, id, 'suggestion')
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
+export function validateSuggestion(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
+    `${id}#suggestion`,
     v,
-  )
+  ) as ValidationResult<Suggestion>
 }
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 94295f45349..7e941e4dfa9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.searchActorsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
   q: string
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 cd293454902..01c6b678247 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+export const id = 'app.bsky.unspecced.searchPostsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
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 12f4d674794..14d8d9ee41a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
   jobId: string
@@ -19,14 +21,12 @@ export interface JobStatus {
   [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+export function isJobStatus(
+  v: unknown,
+): v is JobStatus & { $type: 'app.bsky.video.defs#jobStatus' } {
+  return is$typed(v, id, 'jobStatus')
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus(v: unknown) {
+  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
 }
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 3e075ba2195..d2aac514ae9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+export const id = 'app.bsky.video.getJobStatus'
+
 export interface QueryParams {
   jobId: string
 }
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 f0f23003b0b..b769714371b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'app.bsky.video.getUploadLimits'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 c23ff677a4b..39c8b6c9ac4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -4,12 +4,14 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+export const id = 'app.bsky.video.uploadVideo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
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 b837351c1e1..6b4b30f1e0d 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+export function isRecord(v: unknown): v is Record & {
+  $type: 'chat.bsky.actor.declaration#main' | 'chat.bsky.actor.declaration'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
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 8a05d480784..af004d93be9 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'chat.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,14 +23,15 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(
+  v: unknown,
+): v is ProfileViewBasic & { $type: 'chat.bsky.actor.defs#profileViewBasic' } {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
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 08714990fcb..753ea0d7e56 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.actor.deleteAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 f6f38ab2fb3..73b7bc7e050 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.actor.exportAccountData'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 b2452410be2..d56ce0dbbb5 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
 
+export const id = 'chat.bsky.convo.defs'
+
 export interface MessageRef {
   did: string
   convoId: string
@@ -16,16 +18,17 @@ export interface MessageRef {
   [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+export function isMessageRef(
+  v: unknown,
+): v is MessageRef & { $type: 'chat.bsky.convo.defs#messageRef' } {
+  return is$typed(v, id, 'messageRef')
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageRef`,
+    v,
+  ) as ValidationResult<MessageRef>
 }
 
 export interface MessageInput {
@@ -36,16 +39,17 @@ export interface MessageInput {
   [k: string]: unknown
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+export function isMessageInput(
+  v: unknown,
+): v is MessageInput & { $type: 'chat.bsky.convo.defs#messageInput' } {
+  return is$typed(v, id, 'messageInput')
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageInput`,
+    v,
+  ) as ValidationResult<MessageInput>
 }
 
 export interface MessageView {
@@ -60,16 +64,17 @@ export interface MessageView {
   [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+export function isMessageView(
+  v: unknown,
+): v is MessageView & { $type: 'chat.bsky.convo.defs#messageView' } {
+  return is$typed(v, id, 'messageView')
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageView`,
+    v,
+  ) as ValidationResult<MessageView>
 }
 
 export interface DeletedMessageView {
@@ -80,16 +85,17 @@ export interface DeletedMessageView {
   [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+export function isDeletedMessageView(v: unknown): v is DeletedMessageView & {
+  $type: 'chat.bsky.convo.defs#deletedMessageView'
+} {
+  return is$typed(v, id, 'deletedMessageView')
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#deletedMessageView`,
+    v,
+  ) as ValidationResult<DeletedMessageView>
 }
 
 export interface MessageViewSender {
@@ -97,16 +103,17 @@ export interface MessageViewSender {
   [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+export function isMessageViewSender(v: unknown): v is MessageViewSender & {
+  $type: 'chat.bsky.convo.defs#messageViewSender'
+} {
+  return is$typed(v, id, 'messageViewSender')
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageViewSender`,
+    v,
+  ) as ValidationResult<MessageViewSender>
 }
 
 export interface ConvoView {
@@ -123,16 +130,14 @@ export interface ConvoView {
   [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+export function isConvoView(
+  v: unknown,
+): v is ConvoView & { $type: 'chat.bsky.convo.defs#convoView' } {
+  return is$typed(v, id, 'convoView')
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView(v: unknown) {
+  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
 }
 
 export interface LogBeginConvo {
@@ -141,16 +146,17 @@ export interface LogBeginConvo {
   [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+export function isLogBeginConvo(
+  v: unknown,
+): v is LogBeginConvo & { $type: 'chat.bsky.convo.defs#logBeginConvo' } {
+  return is$typed(v, id, 'logBeginConvo')
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logBeginConvo`,
+    v,
+  ) as ValidationResult<LogBeginConvo>
 }
 
 export interface LogLeaveConvo {
@@ -159,16 +165,17 @@ export interface LogLeaveConvo {
   [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+export function isLogLeaveConvo(
+  v: unknown,
+): v is LogLeaveConvo & { $type: 'chat.bsky.convo.defs#logLeaveConvo' } {
+  return is$typed(v, id, 'logLeaveConvo')
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logLeaveConvo`,
+    v,
+  ) as ValidationResult<LogLeaveConvo>
 }
 
 export interface LogCreateMessage {
@@ -181,16 +188,17 @@ export interface LogCreateMessage {
   [k: string]: unknown
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+export function isLogCreateMessage(
+  v: unknown,
+): v is LogCreateMessage & { $type: 'chat.bsky.convo.defs#logCreateMessage' } {
+  return is$typed(v, id, 'logCreateMessage')
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logCreateMessage`,
+    v,
+  ) as ValidationResult<LogCreateMessage>
 }
 
 export interface LogDeleteMessage {
@@ -203,14 +211,15 @@ export interface LogDeleteMessage {
   [k: string]: unknown
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+export function isLogDeleteMessage(
+  v: unknown,
+): v is LogDeleteMessage & { $type: 'chat.bsky.convo.defs#logDeleteMessage' } {
+  return is$typed(v, id, 'logDeleteMessage')
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logDeleteMessage`,
+    v,
+  ) as ValidationResult<LogDeleteMessage>
 }
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 c05bc99b36a..ae3e904f1bd 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.deleteMessageForSelf'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 1448c75b306..06a188fb031 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getConvo'
+
 export interface QueryParams {
   convoId: string
 }
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 108dfd6ad5b..dfdfe34a722 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getConvoForMembers'
+
 export interface QueryParams {
   members: string[]
 }
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 89f6778c4d3..7e035a90201 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getLog'
+
 export interface QueryParams {
   cursor?: string
 }
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 a615ba37674..e5878ad980c 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.getMessages'
+
 export interface QueryParams {
   convoId: string
   limit: number
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 8b76a7b0c75..086e4bf78e8 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.convo.leaveConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 4d6f35bf39c..b253dd9cfc1 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.listConvos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 ddb57623913..bf88be58357 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.muteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 ab2d8b03f89..da4d7a40828 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.sendMessage'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b3c2c2bc252..27d92c4bfcf 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.sendMessageBatch'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -55,14 +57,12 @@ export interface BatchItem {
   [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+export function isBatchItem(
+  v: unknown,
+): v is BatchItem & { $type: 'chat.bsky.convo.sendMessageBatch#batchItem' } {
+  return is$typed(v, id, 'batchItem')
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem(v: unknown) {
+  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
 }
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 ddb57623913..d8eb32a25a2 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.unmuteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b879cde82b0..d1a58113725 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+export const id = 'chat.bsky.convo.updateRead'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 077a0076bab..30842b4fc87 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.moderation.getActorMetadata'
+
 export interface QueryParams {
   actor: string
 }
@@ -54,14 +56,12 @@ export interface Metadata {
   [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+export function isMetadata(
+  v: unknown,
+): v is Metadata & { $type: 'chat.bsky.moderation.getActorMetadata#metadata' } {
+  return is$typed(v, id, 'metadata')
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata(v: unknown) {
+  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
 }
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 0a1f5b1b691..37358f83f28 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from '../convo/defs'
 
+export const id = 'chat.bsky.moderation.getMessageContext'
+
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
   convoId?: string
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 d9c95f69643..975584fea52 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'chat.bsky.moderation.updateActorAccess'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 f58b7c7ece4..e428182996b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
@@ -2,27 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+export const id = 'com.atproto.admin.defs'
+
 export interface StatusAttr {
   applied: boolean
   ref?: string
   [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+export function isStatusAttr(
+  v: unknown,
+): v is StatusAttr & { $type: 'com.atproto.admin.defs#statusAttr' } {
+  return is$typed(v, id, 'statusAttr')
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr(v: unknown) {
+  return lexicons.validate(
+    `${id}#statusAttr`,
+    v,
+  ) as ValidationResult<StatusAttr>
 }
 
 export interface AccountView {
@@ -41,16 +44,17 @@ export interface AccountView {
   [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+export function isAccountView(
+  v: unknown,
+): v is AccountView & { $type: 'com.atproto.admin.defs#accountView' } {
+  return is$typed(v, id, 'accountView')
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountView`,
+    v,
+  ) as ValidationResult<AccountView>
 }
 
 export interface RepoRef {
@@ -58,16 +62,14 @@ export interface RepoRef {
   [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+export function isRepoRef(
+  v: unknown,
+): v is RepoRef & { $type: 'com.atproto.admin.defs#repoRef' } {
+  return is$typed(v, id, 'repoRef')
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef(v: unknown) {
+  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
 }
 
 export interface RepoBlobRef {
@@ -77,16 +79,17 @@ export interface RepoBlobRef {
   [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+export function isRepoBlobRef(
+  v: unknown,
+): v is RepoBlobRef & { $type: 'com.atproto.admin.defs#repoBlobRef' } {
+  return is$typed(v, id, 'repoBlobRef')
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoBlobRef`,
+    v,
+  ) as ValidationResult<RepoBlobRef>
 }
 
 export interface ThreatSignature {
@@ -95,14 +98,15 @@ export interface ThreatSignature {
   [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+export function isThreatSignature(
+  v: unknown,
+): v is ThreatSignature & { $type: 'com.atproto.admin.defs#threatSignature' } {
+  return is$typed(v, id, 'threatSignature')
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature(v: unknown) {
+  return lexicons.validate(
+    `${id}#threatSignature`,
+    v,
+  ) as ValidationResult<ThreatSignature>
 }
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 003c1b5ebcd..166e66e175f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 68c6503d95e..d9a061d7ebc 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.disableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 2bf8de35583..55e3ed71292 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.disableInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 3f2836e7142..912fc54e591 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.enableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 c7b840a153d..045b14e8b48 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.getAccountInfo'
+
 export interface QueryParams {
   did: string
 }
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 99ef44a99f5..332389f8dca 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.getAccountInfos'
+
 export interface QueryParams {
   dids: string[]
 }
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 d68b97d775a..9c59ba185a7 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+export const id = 'com.atproto.admin.getInviteCodes'
+
 export interface QueryParams {
   sort: 'recent' | 'usage' | (string & {})
   limit: number
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 c13496638c8..fbcdeb0016f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+export const id = 'com.atproto.admin.getSubjectStatus'
+
 export interface QueryParams {
   did?: string
   uri?: string
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 80d0eecd926..4c5354d87ed 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+export const id = 'com.atproto.admin.searchAccounts'
+
 export interface QueryParams {
   email?: string
   cursor?: string
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 836fba39f79..a79f0942d87 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.sendEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 ebabffbccdb..552da287fa8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.updateAccountEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 d6dc4a2dc25..556625556dd 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.updateAccountHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 948568f0d3d..1cd4ae387a2 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.admin.updateAccountPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 c03d9667cae..a27e65ef2b9 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+export const id = 'com.atproto.admin.updateSubjectStatus'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 5fa374de737..1e20823680f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.getRecommendedDidCredentials'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 82672f1d1c7..817075fd25a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.requestPlcOperationSignature'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 05019df6166..3fd5046e04a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.resolveHandle'
+
 export interface QueryParams {
   /** The handle to resolve. */
   handle: string
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 3c908c049f2..f349ce572dc 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.signPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 5290b55d023..788c8ce7b82 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.submitPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 f451d1f57c7..c68bb2b27e5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.identity.updateHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 348e985622b..15f11ef9919 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
@@ -29,16 +31,14 @@ export interface Label {
   [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+export function isLabel(
+  v: unknown,
+): v is Label & { $type: 'com.atproto.label.defs#label' } {
+  return is$typed(v, id, 'label')
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel(v: unknown) {
+  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
@@ -47,16 +47,17 @@ export interface SelfLabels {
   [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+export function isSelfLabels(
+  v: unknown,
+): v is SelfLabels & { $type: 'com.atproto.label.defs#selfLabels' } {
+  return is$typed(v, id, 'selfLabels')
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels(v: unknown) {
+  return lexicons.validate(
+    `${id}#selfLabels`,
+    v,
+  ) as ValidationResult<SelfLabels>
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
@@ -66,16 +67,14 @@ export interface SelfLabel {
   [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+export function isSelfLabel(
+  v: unknown,
+): v is SelfLabel & { $type: 'com.atproto.label.defs#selfLabel' } {
+  return is$typed(v, id, 'selfLabel')
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel(v: unknown) {
+  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
@@ -94,16 +93,19 @@ export interface LabelValueDefinition {
   [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+export function isLabelValueDefinition(
+  v: unknown,
+): v is LabelValueDefinition & {
+  $type: 'com.atproto.label.defs#labelValueDefinition'
+} {
+  return is$typed(v, id, 'labelValueDefinition')
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelValueDefinition`,
+    v,
+  ) as ValidationResult<LabelValueDefinition>
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
@@ -119,21 +121,17 @@ export interface LabelValueDefinitionStrings {
 
 export function isLabelValueDefinitionStrings(
   v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+): v is LabelValueDefinitionStrings & {
+  $type: 'com.atproto.label.defs#labelValueDefinitionStrings'
+} {
+  return is$typed(v, id, 'labelValueDefinitionStrings')
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
+export function validateLabelValueDefinitionStrings(v: unknown) {
   return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+    `${id}#labelValueDefinitionStrings`,
     v,
-  )
+  ) as ValidationResult<LabelValueDefinitionStrings>
 }
 
 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 0c9d55a6961..aafadf6eb75 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from './defs'
 
+export const id = 'com.atproto.label.queryLabels'
+
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
   uriPatterns: string[]
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 6034b35d895..6d2b9fad745 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 import * as ComAtprotoLabelDefs from './defs'
 
+export const id = 'com.atproto.label.subscribeLabels'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -36,16 +38,14 @@ export interface Labels {
   [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+export function isLabels(
+  v: unknown,
+): v is Labels & { $type: 'com.atproto.label.subscribeLabels#labels' } {
+  return is$typed(v, id, 'labels')
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels(v: unknown) {
+  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
 }
 
 export interface Info {
@@ -54,14 +54,12 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: 'com.atproto.label.subscribeLabels#info' } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
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 aa3f810a91c..ac54e90ca42 100644
--- a/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -3,14 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } 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'
 
+export const id = 'com.atproto.moderation.createReport'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 08e555c2422..cce51afac4a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
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 4e3c8dcef3d..a3c40d943f8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.applyWrites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -65,16 +67,14 @@ export interface Create {
   [k: string]: unknown
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+export function isCreate(
+  v: unknown,
+): v is Create & { $type: 'com.atproto.repo.applyWrites#create' } {
+  return is$typed(v, id, 'create')
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate(v: unknown) {
+  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
 }
 
 /** Operation which updates an existing record. */
@@ -85,16 +85,14 @@ export interface Update {
   [k: string]: unknown
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+export function isUpdate(
+  v: unknown,
+): v is Update & { $type: 'com.atproto.repo.applyWrites#update' } {
+  return is$typed(v, id, 'update')
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate(v: unknown) {
+  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
 }
 
 /** Operation which deletes an existing record. */
@@ -104,16 +102,14 @@ export interface Delete {
   [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+export function isDelete(
+  v: unknown,
+): v is Delete & { $type: 'com.atproto.repo.applyWrites#delete' } {
+  return is$typed(v, id, 'delete')
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete(v: unknown) {
+  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
 }
 
 export interface CreateResult {
@@ -123,16 +119,17 @@ export interface CreateResult {
   [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+export function isCreateResult(
+  v: unknown,
+): v is CreateResult & { $type: 'com.atproto.repo.applyWrites#createResult' } {
+  return is$typed(v, id, 'createResult')
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#createResult`,
+    v,
+  ) as ValidationResult<CreateResult>
 }
 
 export interface UpdateResult {
@@ -142,30 +139,32 @@ export interface UpdateResult {
   [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+export function isUpdateResult(
+  v: unknown,
+): v is UpdateResult & { $type: 'com.atproto.repo.applyWrites#updateResult' } {
+  return is$typed(v, id, 'updateResult')
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#updateResult`,
+    v,
+  ) as ValidationResult<UpdateResult>
 }
 
 export interface DeleteResult {
   [k: string]: unknown
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+export function isDeleteResult(
+  v: unknown,
+): v is DeleteResult & { $type: 'com.atproto.repo.applyWrites#deleteResult' } {
+  return is$typed(v, id, 'deleteResult')
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#deleteResult`,
+    v,
+  ) as ValidationResult<DeleteResult>
 }
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 5cac0848bf1..d48f93d5754 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.createRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 8357fe2a611..174e203464e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
   cid: string
@@ -12,14 +14,15 @@ export interface CommitMeta {
   [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+export function isCommitMeta(
+  v: unknown,
+): v is CommitMeta & { $type: 'com.atproto.repo.defs#commitMeta' } {
+  return is$typed(v, id, 'commitMeta')
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta(v: unknown) {
+  return lexicons.validate(
+    `${id}#commitMeta`,
+    v,
+  ) as ValidationResult<CommitMeta>
 }
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 e594cd00adf..76ee12900ac 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.deleteRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 749bedcfeb7..130f12e5414 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.describeRepo'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
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 9d03da19530..714c72a1a73 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.getRecord'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
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 59288c7a027..ce1308eefee 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.importRepo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
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 40f4d385e47..b5ee1a58803 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.listMissingBlobs'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -52,14 +54,15 @@ export interface RecordBlob {
   [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+export function isRecordBlob(
+  v: unknown,
+): v is RecordBlob & { $type: 'com.atproto.repo.listMissingBlobs#recordBlob' } {
+  return is$typed(v, id, 'recordBlob')
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordBlob`,
+    v,
+  ) as ValidationResult<RecordBlob>
 }
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 f46f6eb0f7f..f0f5239ab5e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.listRecords'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -64,14 +66,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: 'com.atproto.repo.listRecords#record' } {
+  return is$typed(v, id, 'record')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
 }
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 5cde768d7c2..dca58eb45a1 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+export const id = 'com.atproto.repo.putRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 8b21a6ddf81..1bf0c9a4218 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
   uri: string
@@ -12,15 +14,12 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+export function isMain(v: unknown): v is Main & {
+  $type: 'com.atproto.repo.strongRef#main' | 'com.atproto.repo.strongRef'
+} {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
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 4a712346a0b..fd093015e5d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.repo.uploadBlob'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
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 82672f1d1c7..47ff541186e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.activateAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 f17182a8dce..e6ba5dd7a5a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.checkAccountStatus'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 b667a04b996..5f45b6241e0 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.confirmEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6e9b2f9f3c2..6e46102755d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 00657a2058f..bcaa2d4f426 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -57,17 +59,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: 'com.atproto.server.createAppPassword#appPassword'
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
+export function validateAppPassword(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
+    `${id}#appPassword`,
     v,
-  )
+  ) as ValidationResult<AppPassword>
 }
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 9cfeacc7e28..4c7bdc68221 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createInviteCode'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 eb6cd2bb1b1..bf9207dbae9 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -56,17 +58,15 @@ export interface AccountCodes {
   [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+export function isAccountCodes(v: unknown): v is AccountCodes & {
+  $type: 'com.atproto.server.createInviteCodes#accountCodes'
+} {
+  return is$typed(v, id, 'accountCodes')
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
+export function validateAccountCodes(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
+    `${id}#accountCodes`,
     v,
-  )
+  ) as ValidationResult<AccountCodes>
 }
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 96f7d79d5bc..a4f9b4ea299 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.createSession'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b3793d6b2e0..21fb1da53eb 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.deactivateAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 9bd67c9d7a5..69a456c9ebf 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
   code: string
@@ -17,16 +19,17 @@ export interface InviteCode {
   [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+export function isInviteCode(
+  v: unknown,
+): v is InviteCode & { $type: 'com.atproto.server.defs#inviteCode' } {
+  return is$typed(v, id, 'inviteCode')
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCode`,
+    v,
+  ) as ValidationResult<InviteCode>
 }
 
 export interface InviteCodeUse {
@@ -35,14 +38,15 @@ export interface InviteCodeUse {
   [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+export function isInviteCodeUse(
+  v: unknown,
+): v is InviteCodeUse & { $type: 'com.atproto.server.defs#inviteCodeUse' } {
+  return is$typed(v, id, 'inviteCodeUse')
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCodeUse`,
+    v,
+  ) as ValidationResult<InviteCodeUse>
 }
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 4fcec360a11..65e6c4b4d67 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 82672f1d1c7..54172a5b52f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.deleteSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 e21868158b3..bb2b13511cf 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.describeServer'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -56,16 +58,14 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: 'com.atproto.server.describeServer#links' } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
 
 export interface Contact {
@@ -73,14 +73,12 @@ export interface Contact {
   [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+export function isContact(
+  v: unknown,
+): v is Contact & { $type: 'com.atproto.server.describeServer#contact' } {
+  return is$typed(v, id, 'contact')
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact(v: unknown) {
+  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
 }
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 82c3ffa8c31..b2400f07631 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from './defs'
 
+export const id = 'com.atproto.server.getAccountInviteCodes'
+
 export interface QueryParams {
   includeUsed: boolean
   /** Controls whether any new 'earned' but not 'created' invites should be created. */
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 14f249fde44..87dd567bec1 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.getServiceAuth'
+
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
   aud: string
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 be34cb92afd..94c3063e409 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.getSession'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 397e7043e67..ce8a2b15722 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.listAppPasswords'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -50,14 +52,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: 'com.atproto.server.listAppPasswords#appPassword'
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword(v: unknown) {
+  return lexicons.validate(
+    `${id}#appPassword`,
+    v,
+  ) as ValidationResult<AppPassword>
 }
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 1d6272a0d71..0171f856e80 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.refreshSession'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 82672f1d1c7..147c1bef1ac 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestAccountDelete'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 82672f1d1c7..4ed07343349 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestEmailConfirmation'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
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 24dce3e12af..3da1fe9262b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestEmailUpdate'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 d0f3f2ad769..a89ba697b7b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.requestPasswordReset'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 0ec1e80c77c..59326f3d943 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.reserveSigningKey'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 38f63382cf0..e7b0fd81641 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.resetPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 769ad6aa521..849415e4a27 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.revokeAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 34fc7421979..692cfe6763d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.server.updateEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b1581d6e473..4cf3f512668 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getBlob'
+
 export interface QueryParams {
   /** The DID of the account. */
   did: string
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 925b4a7d50b..919d5867f6e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getBlocks'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 51856b9088d..62f07fd839b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getCheckout'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 adedd4cf211..f0f4a380c5e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getHead'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 f0e9a757d04..22a04bd1f8e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getLatestCommit'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 83d88655228..80ec16706f5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getRecord'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 883ff37def1..1790893b7a8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getRepo'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 00abbeaa84b..e0846692f81 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.getRepoStatus'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 c6ea955ee0c..6372388b6dd 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.listBlobs'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
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 5628b0b5147..5074c8aa772 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.listRepos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -57,14 +59,12 @@ export interface Repo {
   [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+export function isRepo(
+  v: unknown,
+): v is Repo & { $type: 'com.atproto.sync.listRepos#repo' } {
+  return is$typed(v, id, 'repo')
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo(v: unknown) {
+  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
 }
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 8a0af577c7c..48c853fc46e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.notifyOfUpdate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 31180aabf58..44827aa5507 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.sync.requestCrawl'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 8f9855a5da4..0e8194cc1e9 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 
+export const id = 'com.atproto.sync.subscribeRepos'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -61,16 +63,14 @@ export interface Commit {
   [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+export function isCommit(
+  v: unknown,
+): v is Commit & { $type: 'com.atproto.sync.subscribeRepos#commit' } {
+  return is$typed(v, id, 'commit')
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit(v: unknown) {
+  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
 }
 
 /** 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. */
@@ -83,16 +83,14 @@ export interface Identity {
   [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+export function isIdentity(
+  v: unknown,
+): v is Identity & { $type: 'com.atproto.sync.subscribeRepos#identity' } {
+  return is$typed(v, id, 'identity')
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity(v: unknown) {
+  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
 }
 
 /** 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. */
@@ -107,16 +105,14 @@ export interface Account {
   [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+export function isAccount(
+  v: unknown,
+): v is Account & { $type: 'com.atproto.sync.subscribeRepos#account' } {
+  return is$typed(v, id, 'account')
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount(v: unknown) {
+  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
 }
 
 /** DEPRECATED -- Use #identity event instead */
@@ -128,16 +124,14 @@ export interface Handle {
   [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+export function isHandle(
+  v: unknown,
+): v is Handle & { $type: 'com.atproto.sync.subscribeRepos#handle' } {
+  return is$typed(v, id, 'handle')
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle(v: unknown) {
+  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -149,16 +143,14 @@ export interface Migrate {
   [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+export function isMigrate(
+  v: unknown,
+): v is Migrate & { $type: 'com.atproto.sync.subscribeRepos#migrate' } {
+  return is$typed(v, id, 'migrate')
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate(v: unknown) {
+  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -169,16 +161,14 @@ export interface Tombstone {
   [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+export function isTombstone(
+  v: unknown,
+): v is Tombstone & { $type: 'com.atproto.sync.subscribeRepos#tombstone' } {
+  return is$typed(v, id, 'tombstone')
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone(v: unknown) {
+  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
 }
 
 export interface Info {
@@ -187,16 +177,14 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: 'com.atproto.sync.subscribeRepos#info' } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
 
 /** A repo operation, ie a mutation of a single record. */
@@ -208,14 +196,12 @@ export interface RepoOp {
   [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+export function isRepoOp(
+  v: unknown,
+): v is RepoOp & { $type: 'com.atproto.sync.subscribeRepos#repoOp' } {
+  return is$typed(v, id, 'repoOp')
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp(v: unknown) {
+  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
 }
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 9486bce2b2b..3fa4f04db56 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.temp.checkSignupQueue'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 0fbdeed1196..f52407cef2b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from '../label/defs'
 
+export const id = 'com.atproto.temp.fetchLabels'
+
 export interface QueryParams {
   since?: number
   limit: number
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 c977500fc33..c384b552934 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'com.atproto.temp.requestPhoneVerification'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 6d29f93bdba..81930ed38d1 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+export const id = 'tools.ozone.communication.createTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 1342dc3c399..0e13e5952cf 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
   id: string
@@ -24,14 +26,15 @@ export interface TemplateView {
   [k: string]: unknown
 }
 
-export function isTemplateView(v: unknown): v is TemplateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.communication.defs#templateView'
-  )
+export function isTemplateView(v: unknown): v is TemplateView & {
+  $type: 'tools.ozone.communication.defs#templateView'
+} {
+  return is$typed(v, id, 'templateView')
 }
 
-export function validateTemplateView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.communication.defs#templateView', v)
+export function validateTemplateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#templateView`,
+    v,
+  ) as ValidationResult<TemplateView>
 }
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 c5ae5cd469f..08fd990f56f 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.communication.deleteTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 4573ac7bbb9..272c6ed4425 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+export const id = 'tools.ozone.communication.listTemplates'
+
 export interface QueryParams {}
 
 export type InputSchema = 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 f8c5817b4d9..48dda69cf90 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+export const id = 'tools.ozone.communication.updateTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 2ce5e2965cf..8f525a8a46b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { 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'
@@ -12,6 +12,8 @@ import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
 import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+export const id = 'tools.ozone.moderation.defs'
+
 export interface ModEventView {
   id: number
   event:
@@ -47,16 +49,17 @@ export interface ModEventView {
   [k: string]: unknown
 }
 
-export function isModEventView(v: unknown): v is ModEventView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventView'
-  )
+export function isModEventView(
+  v: unknown,
+): v is ModEventView & { $type: 'tools.ozone.moderation.defs#modEventView' } {
+  return is$typed(v, id, 'modEventView')
 }
 
-export function validateModEventView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventView', v)
+export function validateModEventView(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventView`,
+    v,
+  ) as ValidationResult<ModEventView>
 }
 
 export interface ModEventViewDetail {
@@ -93,16 +96,17 @@ export interface ModEventViewDetail {
   [k: string]: unknown
 }
 
-export function isModEventViewDetail(v: unknown): v is ModEventViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventViewDetail'
-  )
+export function isModEventViewDetail(v: unknown): v is ModEventViewDetail & {
+  $type: 'tools.ozone.moderation.defs#modEventViewDetail'
+} {
+  return is$typed(v, id, 'modEventViewDetail')
 }
 
-export function validateModEventViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventViewDetail', v)
+export function validateModEventViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventViewDetail`,
+    v,
+  ) as ValidationResult<ModEventViewDetail>
 }
 
 export interface SubjectStatusView {
@@ -139,16 +143,17 @@ export interface SubjectStatusView {
   [k: string]: unknown
 }
 
-export function isSubjectStatusView(v: unknown): v is SubjectStatusView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#subjectStatusView'
-  )
+export function isSubjectStatusView(v: unknown): v is SubjectStatusView & {
+  $type: 'tools.ozone.moderation.defs#subjectStatusView'
+} {
+  return is$typed(v, id, 'subjectStatusView')
 }
 
-export function validateSubjectStatusView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
+export function validateSubjectStatusView(v: unknown) {
+  return lexicons.validate(
+    `${id}#subjectStatusView`,
+    v,
+  ) as ValidationResult<SubjectStatusView>
 }
 
 export type SubjectReviewState =
@@ -177,16 +182,17 @@ export interface ModEventTakedown {
   [k: string]: unknown
 }
 
-export function isModEventTakedown(v: unknown): v is ModEventTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTakedown'
-  )
+export function isModEventTakedown(v: unknown): v is ModEventTakedown & {
+  $type: 'tools.ozone.moderation.defs#modEventTakedown'
+} {
+  return is$typed(v, id, 'modEventTakedown')
 }
 
-export function validateModEventTakedown(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTakedown', v)
+export function validateModEventTakedown(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTakedown`,
+    v,
+  ) as ValidationResult<ModEventTakedown>
 }
 
 /** Revert take down action on a subject */
@@ -198,19 +204,17 @@ export interface ModEventReverseTakedown {
 
 export function isModEventReverseTakedown(
   v: unknown,
-): v is ModEventReverseTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReverseTakedown'
-  )
+): v is ModEventReverseTakedown & {
+  $type: 'tools.ozone.moderation.defs#modEventReverseTakedown'
+} {
+  return is$typed(v, id, 'modEventReverseTakedown')
 }
 
-export function validateModEventReverseTakedown(v: unknown): ValidationResult {
+export function validateModEventReverseTakedown(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventReverseTakedown',
+    `${id}#modEventReverseTakedown`,
     v,
-  )
+  ) as ValidationResult<ModEventReverseTakedown>
 }
 
 /** Resolve appeal on a subject */
@@ -222,19 +226,17 @@ export interface ModEventResolveAppeal {
 
 export function isModEventResolveAppeal(
   v: unknown,
-): v is ModEventResolveAppeal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventResolveAppeal'
-  )
+): v is ModEventResolveAppeal & {
+  $type: 'tools.ozone.moderation.defs#modEventResolveAppeal'
+} {
+  return is$typed(v, id, 'modEventResolveAppeal')
 }
 
-export function validateModEventResolveAppeal(v: unknown): ValidationResult {
+export function validateModEventResolveAppeal(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventResolveAppeal',
+    `${id}#modEventResolveAppeal`,
     v,
-  )
+  ) as ValidationResult<ModEventResolveAppeal>
 }
 
 /** Add a comment to a subject */
@@ -245,16 +247,17 @@ export interface ModEventComment {
   [k: string]: unknown
 }
 
-export function isModEventComment(v: unknown): v is ModEventComment {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventComment'
-  )
+export function isModEventComment(v: unknown): v is ModEventComment & {
+  $type: 'tools.ozone.moderation.defs#modEventComment'
+} {
+  return is$typed(v, id, 'modEventComment')
 }
 
-export function validateModEventComment(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventComment', v)
+export function validateModEventComment(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventComment`,
+    v,
+  ) as ValidationResult<ModEventComment>
 }
 
 /** Report a subject */
@@ -266,16 +269,17 @@ export interface ModEventReport {
   [k: string]: unknown
 }
 
-export function isModEventReport(v: unknown): v is ModEventReport {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReport'
-  )
+export function isModEventReport(v: unknown): v is ModEventReport & {
+  $type: 'tools.ozone.moderation.defs#modEventReport'
+} {
+  return is$typed(v, id, 'modEventReport')
 }
 
-export function validateModEventReport(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventReport', v)
+export function validateModEventReport(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventReport`,
+    v,
+  ) as ValidationResult<ModEventReport>
 }
 
 /** Apply/Negate labels on a subject */
@@ -286,16 +290,17 @@ export interface ModEventLabel {
   [k: string]: unknown
 }
 
-export function isModEventLabel(v: unknown): v is ModEventLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventLabel'
-  )
+export function isModEventLabel(
+  v: unknown,
+): v is ModEventLabel & { $type: 'tools.ozone.moderation.defs#modEventLabel' } {
+  return is$typed(v, id, 'modEventLabel')
 }
 
-export function validateModEventLabel(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
+export function validateModEventLabel(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventLabel`,
+    v,
+  ) as ValidationResult<ModEventLabel>
 }
 
 export interface ModEventAcknowledge {
@@ -303,16 +308,17 @@ export interface ModEventAcknowledge {
   [k: string]: unknown
 }
 
-export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventAcknowledge'
-  )
+export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge & {
+  $type: 'tools.ozone.moderation.defs#modEventAcknowledge'
+} {
+  return is$typed(v, id, 'modEventAcknowledge')
 }
 
-export function validateModEventAcknowledge(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventAcknowledge', v)
+export function validateModEventAcknowledge(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventAcknowledge`,
+    v,
+  ) as ValidationResult<ModEventAcknowledge>
 }
 
 export interface ModEventEscalate {
@@ -320,16 +326,17 @@ export interface ModEventEscalate {
   [k: string]: unknown
 }
 
-export function isModEventEscalate(v: unknown): v is ModEventEscalate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEscalate'
-  )
+export function isModEventEscalate(v: unknown): v is ModEventEscalate & {
+  $type: 'tools.ozone.moderation.defs#modEventEscalate'
+} {
+  return is$typed(v, id, 'modEventEscalate')
 }
 
-export function validateModEventEscalate(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEscalate', v)
+export function validateModEventEscalate(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEscalate`,
+    v,
+  ) as ValidationResult<ModEventEscalate>
 }
 
 /** Mute incoming reports on a subject */
@@ -340,16 +347,17 @@ export interface ModEventMute {
   [k: string]: unknown
 }
 
-export function isModEventMute(v: unknown): v is ModEventMute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMute'
-  )
+export function isModEventMute(
+  v: unknown,
+): v is ModEventMute & { $type: 'tools.ozone.moderation.defs#modEventMute' } {
+  return is$typed(v, id, 'modEventMute')
 }
 
-export function validateModEventMute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventMute', v)
+export function validateModEventMute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventMute`,
+    v,
+  ) as ValidationResult<ModEventMute>
 }
 
 /** Unmute action on a subject */
@@ -359,16 +367,17 @@ export interface ModEventUnmute {
   [k: string]: unknown
 }
 
-export function isModEventUnmute(v: unknown): v is ModEventUnmute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmute'
-  )
+export function isModEventUnmute(v: unknown): v is ModEventUnmute & {
+  $type: 'tools.ozone.moderation.defs#modEventUnmute'
+} {
+  return is$typed(v, id, 'modEventUnmute')
 }
 
-export function validateModEventUnmute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventUnmute', v)
+export function validateModEventUnmute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventUnmute`,
+    v,
+  ) as ValidationResult<ModEventUnmute>
 }
 
 /** Mute incoming reports from an account */
@@ -379,19 +388,19 @@ export interface ModEventMuteReporter {
   [k: string]: unknown
 }
 
-export function isModEventMuteReporter(v: unknown): v is ModEventMuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMuteReporter'
-  )
+export function isModEventMuteReporter(
+  v: unknown,
+): v is ModEventMuteReporter & {
+  $type: 'tools.ozone.moderation.defs#modEventMuteReporter'
+} {
+  return is$typed(v, id, 'modEventMuteReporter')
 }
 
-export function validateModEventMuteReporter(v: unknown): ValidationResult {
+export function validateModEventMuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventMuteReporter',
+    `${id}#modEventMuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventMuteReporter>
 }
 
 /** Unmute incoming reports from an account */
@@ -403,19 +412,17 @@ export interface ModEventUnmuteReporter {
 
 export function isModEventUnmuteReporter(
   v: unknown,
-): v is ModEventUnmuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmuteReporter'
-  )
+): v is ModEventUnmuteReporter & {
+  $type: 'tools.ozone.moderation.defs#modEventUnmuteReporter'
+} {
+  return is$typed(v, id, 'modEventUnmuteReporter')
 }
 
-export function validateModEventUnmuteReporter(v: unknown): ValidationResult {
+export function validateModEventUnmuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventUnmuteReporter',
+    `${id}#modEventUnmuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventUnmuteReporter>
 }
 
 /** Keep a log of outgoing email to a user */
@@ -429,16 +436,17 @@ export interface ModEventEmail {
   [k: string]: unknown
 }
 
-export function isModEventEmail(v: unknown): v is ModEventEmail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEmail'
-  )
+export function isModEventEmail(
+  v: unknown,
+): v is ModEventEmail & { $type: 'tools.ozone.moderation.defs#modEventEmail' } {
+  return is$typed(v, id, 'modEventEmail')
 }
 
-export function validateModEventEmail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEmail', v)
+export function validateModEventEmail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEmail`,
+    v,
+  ) as ValidationResult<ModEventEmail>
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
@@ -447,16 +455,17 @@ export interface ModEventDivert {
   [k: string]: unknown
 }
 
-export function isModEventDivert(v: unknown): v is ModEventDivert {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventDivert'
-  )
+export function isModEventDivert(v: unknown): v is ModEventDivert & {
+  $type: 'tools.ozone.moderation.defs#modEventDivert'
+} {
+  return is$typed(v, id, 'modEventDivert')
 }
 
-export function validateModEventDivert(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventDivert', v)
+export function validateModEventDivert(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventDivert`,
+    v,
+  ) as ValidationResult<ModEventDivert>
 }
 
 /** Add/Remove a tag on a subject */
@@ -470,16 +479,17 @@ export interface ModEventTag {
   [k: string]: unknown
 }
 
-export function isModEventTag(v: unknown): v is ModEventTag {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTag'
-  )
+export function isModEventTag(
+  v: unknown,
+): v is ModEventTag & { $type: 'tools.ozone.moderation.defs#modEventTag' } {
+  return is$typed(v, id, 'modEventTag')
 }
 
-export function validateModEventTag(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTag', v)
+export function validateModEventTag(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTag`,
+    v,
+  ) as ValidationResult<ModEventTag>
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -499,16 +509,17 @@ export interface AccountEvent {
   [k: string]: unknown
 }
 
-export function isAccountEvent(v: unknown): v is AccountEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountEvent'
-  )
+export function isAccountEvent(
+  v: unknown,
+): v is AccountEvent & { $type: 'tools.ozone.moderation.defs#accountEvent' } {
+  return is$typed(v, id, 'accountEvent')
 }
 
-export function validateAccountEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountEvent', v)
+export function validateAccountEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountEvent`,
+    v,
+  ) as ValidationResult<AccountEvent>
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -521,16 +532,17 @@ export interface IdentityEvent {
   [k: string]: unknown
 }
 
-export function isIdentityEvent(v: unknown): v is IdentityEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#identityEvent'
-  )
+export function isIdentityEvent(
+  v: unknown,
+): v is IdentityEvent & { $type: 'tools.ozone.moderation.defs#identityEvent' } {
+  return is$typed(v, id, 'identityEvent')
 }
 
-export function validateIdentityEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#identityEvent', v)
+export function validateIdentityEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#identityEvent`,
+    v,
+  ) as ValidationResult<IdentityEvent>
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -542,16 +554,17 @@ export interface RecordEvent {
   [k: string]: unknown
 }
 
-export function isRecordEvent(v: unknown): v is RecordEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordEvent'
-  )
+export function isRecordEvent(
+  v: unknown,
+): v is RecordEvent & { $type: 'tools.ozone.moderation.defs#recordEvent' } {
+  return is$typed(v, id, 'recordEvent')
 }
 
-export function validateRecordEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordEvent', v)
+export function validateRecordEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordEvent`,
+    v,
+  ) as ValidationResult<RecordEvent>
 }
 
 export interface RepoView {
@@ -569,16 +582,14 @@ export interface RepoView {
   [k: string]: unknown
 }
 
-export function isRepoView(v: unknown): v is RepoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoView'
-  )
+export function isRepoView(
+  v: unknown,
+): v is RepoView & { $type: 'tools.ozone.moderation.defs#repoView' } {
+  return is$typed(v, id, 'repoView')
 }
 
-export function validateRepoView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoView', v)
+export function validateRepoView(v: unknown) {
+  return lexicons.validate(`${id}#repoView`, v) as ValidationResult<RepoView>
 }
 
 export interface RepoViewDetail {
@@ -599,16 +610,17 @@ export interface RepoViewDetail {
   [k: string]: unknown
 }
 
-export function isRepoViewDetail(v: unknown): v is RepoViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewDetail'
-  )
+export function isRepoViewDetail(v: unknown): v is RepoViewDetail & {
+  $type: 'tools.ozone.moderation.defs#repoViewDetail'
+} {
+  return is$typed(v, id, 'repoViewDetail')
 }
 
-export function validateRepoViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewDetail', v)
+export function validateRepoViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewDetail`,
+    v,
+  ) as ValidationResult<RepoViewDetail>
 }
 
 export interface RepoViewNotFound {
@@ -616,16 +628,17 @@ export interface RepoViewNotFound {
   [k: string]: unknown
 }
 
-export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewNotFound'
-  )
+export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound & {
+  $type: 'tools.ozone.moderation.defs#repoViewNotFound'
+} {
+  return is$typed(v, id, 'repoViewNotFound')
 }
 
-export function validateRepoViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewNotFound', v)
+export function validateRepoViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewNotFound`,
+    v,
+  ) as ValidationResult<RepoViewNotFound>
 }
 
 export interface RecordView {
@@ -639,16 +652,17 @@ export interface RecordView {
   [k: string]: unknown
 }
 
-export function isRecordView(v: unknown): v is RecordView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordView'
-  )
+export function isRecordView(
+  v: unknown,
+): v is RecordView & { $type: 'tools.ozone.moderation.defs#recordView' } {
+  return is$typed(v, id, 'recordView')
 }
 
-export function validateRecordView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordView', v)
+export function validateRecordView(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordView`,
+    v,
+  ) as ValidationResult<RecordView>
 }
 
 export interface RecordViewDetail {
@@ -663,16 +677,17 @@ export interface RecordViewDetail {
   [k: string]: unknown
 }
 
-export function isRecordViewDetail(v: unknown): v is RecordViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewDetail'
-  )
+export function isRecordViewDetail(v: unknown): v is RecordViewDetail & {
+  $type: 'tools.ozone.moderation.defs#recordViewDetail'
+} {
+  return is$typed(v, id, 'recordViewDetail')
 }
 
-export function validateRecordViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewDetail', v)
+export function validateRecordViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewDetail`,
+    v,
+  ) as ValidationResult<RecordViewDetail>
 }
 
 export interface RecordViewNotFound {
@@ -680,16 +695,17 @@ export interface RecordViewNotFound {
   [k: string]: unknown
 }
 
-export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewNotFound'
-  )
+export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound & {
+  $type: 'tools.ozone.moderation.defs#recordViewNotFound'
+} {
+  return is$typed(v, id, 'recordViewNotFound')
 }
 
-export function validateRecordViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewNotFound', v)
+export function validateRecordViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewNotFound`,
+    v,
+  ) as ValidationResult<RecordViewNotFound>
 }
 
 export interface Moderation {
@@ -697,16 +713,17 @@ export interface Moderation {
   [k: string]: unknown
 }
 
-export function isModeration(v: unknown): v is Moderation {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderation'
-  )
+export function isModeration(
+  v: unknown,
+): v is Moderation & { $type: 'tools.ozone.moderation.defs#moderation' } {
+  return is$typed(v, id, 'moderation')
 }
 
-export function validateModeration(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderation', v)
+export function validateModeration(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderation`,
+    v,
+  ) as ValidationResult<Moderation>
 }
 
 export interface ModerationDetail {
@@ -714,16 +731,17 @@ export interface ModerationDetail {
   [k: string]: unknown
 }
 
-export function isModerationDetail(v: unknown): v is ModerationDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderationDetail'
-  )
+export function isModerationDetail(v: unknown): v is ModerationDetail & {
+  $type: 'tools.ozone.moderation.defs#moderationDetail'
+} {
+  return is$typed(v, id, 'moderationDetail')
 }
 
-export function validateModerationDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderationDetail', v)
+export function validateModerationDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderationDetail`,
+    v,
+  ) as ValidationResult<ModerationDetail>
 }
 
 export interface BlobView {
@@ -739,16 +757,14 @@ export interface BlobView {
   [k: string]: unknown
 }
 
-export function isBlobView(v: unknown): v is BlobView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#blobView'
-  )
+export function isBlobView(
+  v: unknown,
+): v is BlobView & { $type: 'tools.ozone.moderation.defs#blobView' } {
+  return is$typed(v, id, 'blobView')
 }
 
-export function validateBlobView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#blobView', v)
+export function validateBlobView(v: unknown) {
+  return lexicons.validate(`${id}#blobView`, v) as ValidationResult<BlobView>
 }
 
 export interface ImageDetails {
@@ -757,16 +773,17 @@ export interface ImageDetails {
   [k: string]: unknown
 }
 
-export function isImageDetails(v: unknown): v is ImageDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#imageDetails'
-  )
+export function isImageDetails(
+  v: unknown,
+): v is ImageDetails & { $type: 'tools.ozone.moderation.defs#imageDetails' } {
+  return is$typed(v, id, 'imageDetails')
 }
 
-export function validateImageDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#imageDetails', v)
+export function validateImageDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#imageDetails`,
+    v,
+  ) as ValidationResult<ImageDetails>
 }
 
 export interface VideoDetails {
@@ -776,16 +793,17 @@ export interface VideoDetails {
   [k: string]: unknown
 }
 
-export function isVideoDetails(v: unknown): v is VideoDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#videoDetails'
-  )
+export function isVideoDetails(
+  v: unknown,
+): v is VideoDetails & { $type: 'tools.ozone.moderation.defs#videoDetails' } {
+  return is$typed(v, id, 'videoDetails')
 }
 
-export function validateVideoDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#videoDetails', v)
+export function validateVideoDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#videoDetails`,
+    v,
+  ) as ValidationResult<VideoDetails>
 }
 
 export interface AccountHosting {
@@ -804,16 +822,17 @@ export interface AccountHosting {
   [k: string]: unknown
 }
 
-export function isAccountHosting(v: unknown): v is AccountHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountHosting'
-  )
+export function isAccountHosting(v: unknown): v is AccountHosting & {
+  $type: 'tools.ozone.moderation.defs#accountHosting'
+} {
+  return is$typed(v, id, 'accountHosting')
 }
 
-export function validateAccountHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountHosting', v)
+export function validateAccountHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountHosting`,
+    v,
+  ) as ValidationResult<AccountHosting>
 }
 
 export interface RecordHosting {
@@ -824,14 +843,15 @@ export interface RecordHosting {
   [k: string]: unknown
 }
 
-export function isRecordHosting(v: unknown): v is RecordHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordHosting'
-  )
+export function isRecordHosting(
+  v: unknown,
+): v is RecordHosting & { $type: 'tools.ozone.moderation.defs#recordHosting' } {
+  return is$typed(v, id, 'recordHosting')
 }
 
-export function validateRecordHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordHosting', v)
+export function validateRecordHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordHosting`,
+    v,
+  ) as ValidationResult<RecordHosting>
 }
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 1399cf589ee..c98e8903e06 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -3,14 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } 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'
 
+export const id = 'tools.ozone.moderation.emitEvent'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b583510a791..ec2cc8e7b69 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getEvent'
+
 export interface QueryParams {
   id: number
 }
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 a3832cd161c..856c13075b4 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRecord'
+
 export interface QueryParams {
   uri: string
   cid?: string
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 2559727bd65..3688826805d 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRecords'
+
 export interface QueryParams {
   uris: string[]
 }
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 853d6460e85..0b8f206cd3b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRepo'
+
 export interface QueryParams {
   did: string
 }
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 71da4d1bac9..a5a6596621b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.getRepos'
+
 export interface QueryParams {
   dids: string[]
 }
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 752fe333f0b..856eebf5a1f 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.queryEvents'
+
 export interface QueryParams {
   /** The types of events (fully qualified string in the format of tools.ozone.moderation.defs#modEvent<name>) to filter by. If not specified, all events are returned. */
   types?: string[]
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 f1d5bb61690..cd760b73a2b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.queryStatuses'
+
 export interface QueryParams {
   /** All subjects, or subjects from given 'collections' param, belonging to the account specified in the 'subject' param will be returned. */
   includeAllUserRecords?: boolean
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 7696df54d0f..e3529428e6e 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+export const id = 'tools.ozone.moderation.searchRepos'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead */
   term?: string
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 b05ce4246d9..1207767dd7f 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.server.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -51,16 +53,17 @@ export interface ServiceConfig {
   [k: string]: unknown
 }
 
-export function isServiceConfig(v: unknown): v is ServiceConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#serviceConfig'
-  )
+export function isServiceConfig(v: unknown): v is ServiceConfig & {
+  $type: 'tools.ozone.server.getConfig#serviceConfig'
+} {
+  return is$typed(v, id, 'serviceConfig')
 }
 
-export function validateServiceConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#serviceConfig', v)
+export function validateServiceConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#serviceConfig`,
+    v,
+  ) as ValidationResult<ServiceConfig>
 }
 
 export interface ViewerConfig {
@@ -72,14 +75,15 @@ export interface ViewerConfig {
   [k: string]: unknown
 }
 
-export function isViewerConfig(v: unknown): v is ViewerConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#viewerConfig'
-  )
+export function isViewerConfig(
+  v: unknown,
+): v is ViewerConfig & { $type: 'tools.ozone.server.getConfig#viewerConfig' } {
+  return is$typed(v, id, 'viewerConfig')
 }
 
-export function validateViewerConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#viewerConfig', v)
+export function validateViewerConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerConfig`,
+    v,
+  ) as ValidationResult<ViewerConfig>
 }
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 1a48da4e682..b637035c486 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.set.addValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 4256bf8a90f..acf53bd0822 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'tools.ozone.set.defs'
 
 export interface Set {
   name: string
@@ -12,14 +14,14 @@ export interface Set {
   [k: string]: unknown
 }
 
-export function isSet(v: unknown): v is Set {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'tools.ozone.set.defs#set'
-  )
+export function isSet(
+  v: unknown,
+): v is Set & { $type: 'tools.ozone.set.defs#set' } {
+  return is$typed(v, id, 'set')
 }
 
-export function validateSet(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#set', v)
+export function validateSet(v: unknown) {
+  return lexicons.validate(`${id}#set`, v) as ValidationResult<Set>
 }
 
 export interface SetView {
@@ -31,14 +33,12 @@ export interface SetView {
   [k: string]: unknown
 }
 
-export function isSetView(v: unknown): v is SetView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.set.defs#setView'
-  )
+export function isSetView(
+  v: unknown,
+): v is SetView & { $type: 'tools.ozone.set.defs#setView' } {
+  return is$typed(v, id, 'setView')
 }
 
-export function validateSetView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#setView', v)
+export function validateSetView(v: unknown) {
+  return lexicons.validate(`${id}#setView`, v) as ValidationResult<SetView>
 }
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 8b1584c3a1a..80958b6a57a 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.set.deleteSet'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 d1090863925..c94f7cf6121 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.set.deleteValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 abae3c0b33a..eeca0ee7e7d 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+export const id = 'tools.ozone.set.getValues'
+
 export interface QueryParams {
   name: string
   limit: number
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 1eea93a7c4c..cdec980e6d7 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+export const id = 'tools.ozone.set.querySets'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 f51e375e425..d8455bb69d2 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+export const id = 'tools.ozone.set.upsertSet'
+
 export interface QueryParams {}
 
 export type InputSchema = ToolsOzoneSetDefs.Set
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 8a87cbb0e24..8c1f6b1eaa2 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'tools.ozone.setting.defs'
 
 export interface Option {
   key: string
@@ -24,14 +26,12 @@ export interface Option {
   [k: string]: unknown
 }
 
-export function isOption(v: unknown): v is Option {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.setting.defs#option'
-  )
+export function isOption(
+  v: unknown,
+): v is Option & { $type: 'tools.ozone.setting.defs#option' } {
+  return is$typed(v, id, 'option')
 }
 
-export function validateOption(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.setting.defs#option', v)
+export function validateOption(v: unknown) {
+  return lexicons.validate(`${id}#option`, v) as ValidationResult<Option>
 }
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 54ad9608df3..3c1fa7d8749 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSettingDefs from './defs'
 
+export const id = 'tools.ozone.setting.listOptions'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 1d653b314da..d6f918c7223 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.setting.removeOptions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b2e66d073d9..355cc456a8b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSettingDefs from './defs'
 
+export const id = 'tools.ozone.setting.upsertOption'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 2c9d9604aaa..5b42a7ea749 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
+
+export const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
   property: string
@@ -12,14 +14,12 @@ export interface SigDetail {
   [k: string]: unknown
 }
 
-export function isSigDetail(v: unknown): v is SigDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.defs#sigDetail'
-  )
+export function isSigDetail(
+  v: unknown,
+): v is SigDetail & { $type: 'tools.ozone.signature.defs#sigDetail' } {
+  return is$typed(v, id, 'sigDetail')
 }
 
-export function validateSigDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.signature.defs#sigDetail', v)
+export function validateSigDetail(v: unknown) {
+  return lexicons.validate(`${id}#sigDetail`, v) as ValidationResult<SigDetail>
 }
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 c3eced05a5e..1f7fb74a74c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+export const id = 'tools.ozone.signature.findCorrelation'
+
 export interface QueryParams {
   dids: string[]
 }
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 821d5c6c080..e82445fa52c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+export const id = 'tools.ozone.signature.findRelatedAccounts'
+
 export interface QueryParams {
   did: string
   cursor?: string
@@ -55,17 +57,15 @@ export interface RelatedAccount {
   [k: string]: unknown
 }
 
-export function isRelatedAccount(v: unknown): v is RelatedAccount {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
-  )
+export function isRelatedAccount(v: unknown): v is RelatedAccount & {
+  $type: 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
+} {
+  return is$typed(v, id, 'relatedAccount')
 }
 
-export function validateRelatedAccount(v: unknown): ValidationResult {
+export function validateRelatedAccount(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.signature.findRelatedAccounts#relatedAccount',
+    `${id}#relatedAccount`,
     v,
-  )
+  ) as ValidationResult<RelatedAccount>
 }
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 4e37745aa4a..138a1170aaa 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 
+export const id = 'tools.ozone.signature.searchAccounts'
+
 export interface QueryParams {
   values: string[]
   cursor?: string
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 85e40f2a461..3fe8c2efcce 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+export const id = 'tools.ozone.team.addMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 b670ecc0a70..d628e8add2c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 
+export const id = 'tools.ozone.team.defs'
+
 export interface Member {
   did: string
   disabled?: boolean
@@ -22,16 +24,14 @@ export interface Member {
   [k: string]: unknown
 }
 
-export function isMember(v: unknown): v is Member {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.team.defs#member'
-  )
+export function isMember(
+  v: unknown,
+): v is Member & { $type: 'tools.ozone.team.defs#member' } {
+  return is$typed(v, id, 'member')
 }
 
-export function validateMember(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.team.defs#member', v)
+export function validateMember(v: unknown) {
+  return lexicons.validate(`${id}#member`, v) as ValidationResult<Member>
 }
 
 /** 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 3adf03313dc..99eb7a25b20 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+export const id = 'tools.ozone.team.deleteMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
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 1995cc68cc1..e2e6d998783 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+export const id = 'tools.ozone.team.listMembers'
+
 export interface QueryParams {
   limit: number
   cursor?: string
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 57b0a318583..32b9ca7ae5e 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+export const id = 'tools.ozone.team.updateMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/util.ts b/packages/pds/src/lexicon/util.ts
index d7e70440d6e..e76328e680e 100644
--- a/packages/pds/src/lexicon/util.ts
+++ b/packages/pds/src/lexicon/util.ts
@@ -1,13 +1,35 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+export type $Type<Id extends string, Hash extends string> =
+  | (Hash extends 'main' ? Id : never)
+  | `${Id}#${Hash}`
+
+function has$type<V>(v: V): v is V & object & { $type: unknown } {
+  return v != null && typeof v === 'object' && '$type' in v
+}
+
+function check$type<Id extends string, Hash extends string>(
+  $type: unknown,
+  id: Id,
+  hash: Hash,
+): $type is $Type<Id, Hash> {
+  return (
+    typeof $type === 'string' &&
+    ($type === id
+      ? hash === 'main'
+      : // $type === `${id}#${hash}`
+        $type.length === id.length + 1 + hash.length &&
+        $type[id.length] === '#' &&
+        $type.startsWith(id) &&
+        $type.endsWith(hash))
+  )
 }
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+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)
 }