diff --git a/BUILD b/BUILD
index 30b0488dc32..1df5df7f3d8 100644
--- a/BUILD
+++ b/BUILD
@@ -626,6 +626,7 @@ grpc_cc_library(
         "src/core/lib/channel/channel_stack_builder.cc",
         "src/core/lib/channel/channel_tracer.cc",
         "src/core/lib/channel/connected_channel.cc",
+        "src/core/lib/channel/object_registry.cc",
         "src/core/lib/channel/handshaker.cc",
         "src/core/lib/channel/handshaker_factory.cc",
         "src/core/lib/channel/handshaker_registry.cc",
@@ -762,6 +763,7 @@ grpc_cc_library(
         "src/core/lib/channel/channel_tracer.h",
         "src/core/lib/channel/connected_channel.h",
         "src/core/lib/channel/context.h",
+        "src/core/lib/channel/object_registry.h",
         "src/core/lib/channel/handshaker.h",
         "src/core/lib/channel/handshaker_factory.h",
         "src/core/lib/channel/handshaker_registry.h",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1057ade8ec5..91aca47ddf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -645,7 +645,6 @@ add_library(gpr
   src/core/lib/gpr/log_windows.cc
   src/core/lib/gpr/mpscq.cc
   src/core/lib/gpr/murmur_hash.cc
-  src/core/lib/gpr/object_registry.cc
   src/core/lib/gpr/string.cc
   src/core/lib/gpr/string_posix.cc
   src/core/lib/gpr/string_util_windows.cc
@@ -803,6 +802,7 @@ add_library(grpc
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
   src/core/lib/channel/handshaker_registry.cc
+  src/core/lib/channel/object_registry.cc
   src/core/lib/compression/compression.cc
   src/core/lib/compression/message_compress.cc
   src/core/lib/compression/stream_compression.cc
@@ -1144,6 +1144,7 @@ add_library(grpc_cronet
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
   src/core/lib/channel/handshaker_registry.cc
+  src/core/lib/channel/object_registry.cc
   src/core/lib/compression/compression.cc
   src/core/lib/compression/message_compress.cc
   src/core/lib/compression/stream_compression.cc
@@ -1469,6 +1470,7 @@ add_library(grpc_test_util
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
   src/core/lib/channel/handshaker_registry.cc
+  src/core/lib/channel/object_registry.cc
   src/core/lib/compression/compression.cc
   src/core/lib/compression/message_compress.cc
   src/core/lib/compression/stream_compression.cc
@@ -1738,6 +1740,7 @@ add_library(grpc_test_util_unsecure
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
   src/core/lib/channel/handshaker_registry.cc
+  src/core/lib/channel/object_registry.cc
   src/core/lib/compression/compression.cc
   src/core/lib/compression/message_compress.cc
   src/core/lib/compression/stream_compression.cc
@@ -1989,6 +1992,7 @@ add_library(grpc_unsecure
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
   src/core/lib/channel/handshaker_registry.cc
+  src/core/lib/channel/object_registry.cc
   src/core/lib/compression/compression.cc
   src/core/lib/compression/message_compress.cc
   src/core/lib/compression/stream_compression.cc
@@ -2728,6 +2732,7 @@ add_library(grpc++_cronet
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
   src/core/lib/channel/handshaker_registry.cc
+  src/core/lib/channel/object_registry.cc
   src/core/lib/compression/compression.cc
   src/core/lib/compression/message_compress.cc
   src/core/lib/compression/stream_compression.cc
diff --git a/Makefile b/Makefile
index eddd3ad6dcd..69b1ed70cbe 100644
--- a/Makefile
+++ b/Makefile
@@ -2865,7 +2865,6 @@ LIBGPR_SRC = \
     src/core/lib/gpr/log_windows.cc \
     src/core/lib/gpr/mpscq.cc \
     src/core/lib/gpr/murmur_hash.cc \
-    src/core/lib/gpr/object_registry.cc \
     src/core/lib/gpr/string.cc \
     src/core/lib/gpr/string_posix.cc \
     src/core/lib/gpr/string_util_windows.cc \
@@ -3004,6 +3003,7 @@ LIBGRPC_SRC = \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
     src/core/lib/channel/handshaker_registry.cc \
+    src/core/lib/channel/object_registry.cc \
     src/core/lib/compression/compression.cc \
     src/core/lib/compression/message_compress.cc \
     src/core/lib/compression/stream_compression.cc \
@@ -3347,6 +3347,7 @@ LIBGRPC_CRONET_SRC = \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
     src/core/lib/channel/handshaker_registry.cc \
+    src/core/lib/channel/object_registry.cc \
     src/core/lib/compression/compression.cc \
     src/core/lib/compression/message_compress.cc \
     src/core/lib/compression/stream_compression.cc \
@@ -3673,6 +3674,7 @@ LIBGRPC_TEST_UTIL_SRC = \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
     src/core/lib/channel/handshaker_registry.cc \
+    src/core/lib/channel/object_registry.cc \
     src/core/lib/compression/compression.cc \
     src/core/lib/compression/message_compress.cc \
     src/core/lib/compression/stream_compression.cc \
@@ -3935,6 +3937,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
     src/core/lib/channel/handshaker_registry.cc \
+    src/core/lib/channel/object_registry.cc \
     src/core/lib/compression/compression.cc \
     src/core/lib/compression/message_compress.cc \
     src/core/lib/compression/stream_compression.cc \
@@ -4166,6 +4169,7 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
     src/core/lib/channel/handshaker_registry.cc \
+    src/core/lib/channel/object_registry.cc \
     src/core/lib/compression/compression.cc \
     src/core/lib/compression/message_compress.cc \
     src/core/lib/compression/stream_compression.cc \
@@ -4898,6 +4902,7 @@ LIBGRPC++_CRONET_SRC = \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
     src/core/lib/channel/handshaker_registry.cc \
+    src/core/lib/channel/object_registry.cc \
     src/core/lib/compression/compression.cc \
     src/core/lib/compression/message_compress.cc \
     src/core/lib/compression/stream_compression.cc \
diff --git a/build.yaml b/build.yaml
index 29483845963..fc647009702 100644
--- a/build.yaml
+++ b/build.yaml
@@ -47,7 +47,6 @@ filegroups:
   - src/core/lib/gpr/log_windows.cc
   - src/core/lib/gpr/mpscq.cc
   - src/core/lib/gpr/murmur_hash.cc
-  - src/core/lib/gpr/object_registry.cc
   - src/core/lib/gpr/string.cc
   - src/core/lib/gpr/string_posix.cc
   - src/core/lib/gpr/string_util_windows.cc
@@ -107,7 +106,6 @@ filegroups:
   - src/core/lib/gpr/fork.h
   - src/core/lib/gpr/mpscq.h
   - src/core/lib/gpr/murmur_hash.h
-  - src/core/lib/gpr/object_registry.h
   - src/core/lib/gpr/spinlock.h
   - src/core/lib/gpr/string.h
   - src/core/lib/gpr/string_windows.h
@@ -161,6 +159,7 @@ filegroups:
   - src/core/lib/channel/handshaker.cc
   - src/core/lib/channel/handshaker_factory.cc
   - src/core/lib/channel/handshaker_registry.cc
+  - src/core/lib/channel/object_registry.cc
   - src/core/lib/compression/compression.cc
   - src/core/lib/compression/message_compress.cc
   - src/core/lib/compression/stream_compression.cc
@@ -318,6 +317,7 @@ filegroups:
   - src/core/lib/channel/handshaker.h
   - src/core/lib/channel/handshaker_factory.h
   - src/core/lib/channel/handshaker_registry.h
+  - src/core/lib/channel/object_registry.cc
   - src/core/lib/compression/algorithm_metadata.h
   - src/core/lib/compression/message_compress.h
   - src/core/lib/compression/stream_compression.h
diff --git a/config.m4 b/config.m4
index b030b37438d..8a6ccc8d0d3 100644
--- a/config.m4
+++ b/config.m4
@@ -60,7 +60,6 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/gpr/log_windows.cc \
     src/core/lib/gpr/mpscq.cc \
     src/core/lib/gpr/murmur_hash.cc \
-    src/core/lib/gpr/object_registry.cc \
     src/core/lib/gpr/string.cc \
     src/core/lib/gpr/string_posix.cc \
     src/core/lib/gpr/string_util_windows.cc \
@@ -94,6 +93,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
     src/core/lib/channel/handshaker_registry.cc \
+    src/core/lib/channel/object_registry.cc \
     src/core/lib/compression/compression.cc \
     src/core/lib/compression/message_compress.cc \
     src/core/lib/compression/stream_compression.cc \
diff --git a/config.w32 b/config.w32
index 838e17ae815..42a47fca152 100644
--- a/config.w32
+++ b/config.w32
@@ -37,7 +37,6 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\gpr\\log_windows.cc " +
     "src\\core\\lib\\gpr\\mpscq.cc " +
     "src\\core\\lib\\gpr\\murmur_hash.cc " +
-    "src\\core\\lib\\gpr\\object_registry.cc " +
     "src\\core\\lib\\gpr\\string.cc " +
     "src\\core\\lib\\gpr\\string_posix.cc " +
     "src\\core\\lib\\gpr\\string_util_windows.cc " +
@@ -71,6 +70,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\channel\\handshaker.cc " +
     "src\\core\\lib\\channel\\handshaker_factory.cc " +
     "src\\core\\lib\\channel\\handshaker_registry.cc " +
+    "src\\core\\lib\\channel\\object_registry.cc " +
     "src\\core\\lib\\compression\\compression.cc " +
     "src\\core\\lib\\compression\\message_compress.cc " +
     "src\\core\\lib\\compression\\stream_compression.cc " +
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 21e39af0727..8c4ae86bc46 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -197,7 +197,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/gpr/fork.h',
                       'src/core/lib/gpr/mpscq.h',
                       'src/core/lib/gpr/murmur_hash.h',
-                      'src/core/lib/gpr/object_registry.h',
                       'src/core/lib/gpr/spinlock.h',
                       'src/core/lib/gpr/string.h',
                       'src/core/lib/gpr/string_windows.h',
@@ -232,7 +231,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/gpr/log_windows.cc',
                       'src/core/lib/gpr/mpscq.cc',
                       'src/core/lib/gpr/murmur_hash.cc',
-                      'src/core/lib/gpr/object_registry.cc',
                       'src/core/lib/gpr/string.cc',
                       'src/core/lib/gpr/string_posix.cc',
                       'src/core/lib/gpr/string_util_windows.cc',
@@ -340,6 +338,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/channel/handshaker.h',
                       'src/core/lib/channel/handshaker_factory.h',
                       'src/core/lib/channel/handshaker_registry.h',
+                      'src/core/lib/channel/object_registry.cc',
                       'src/core/lib/compression/algorithm_metadata.h',
                       'src/core/lib/compression/message_compress.h',
                       'src/core/lib/compression/stream_compression.h',
@@ -482,6 +481,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/channel/handshaker.cc',
                       'src/core/lib/channel/handshaker_factory.cc',
                       'src/core/lib/channel/handshaker_registry.cc',
+                      'src/core/lib/channel/object_registry.cc',
                       'src/core/lib/compression/compression.cc',
                       'src/core/lib/compression/message_compress.cc',
                       'src/core/lib/compression/stream_compression.cc',
@@ -727,7 +727,6 @@ Pod::Spec.new do |s|
                               'src/core/lib/gpr/fork.h',
                               'src/core/lib/gpr/mpscq.h',
                               'src/core/lib/gpr/murmur_hash.h',
-                              'src/core/lib/gpr/object_registry.h',
                               'src/core/lib/gpr/spinlock.h',
                               'src/core/lib/gpr/string.h',
                               'src/core/lib/gpr/string_windows.h',
@@ -825,6 +824,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/channel/handshaker.h',
                               'src/core/lib/channel/handshaker_factory.h',
                               'src/core/lib/channel/handshaker_registry.h',
+                              'src/core/lib/channel/object_registry.cc',
                               'src/core/lib/compression/algorithm_metadata.h',
                               'src/core/lib/compression/message_compress.h',
                               'src/core/lib/compression/stream_compression.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 085b093c8ed..9d2b4a94b10 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -88,7 +88,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/gpr/fork.h )
   s.files += %w( src/core/lib/gpr/mpscq.h )
   s.files += %w( src/core/lib/gpr/murmur_hash.h )
-  s.files += %w( src/core/lib/gpr/object_registry.h )
   s.files += %w( src/core/lib/gpr/spinlock.h )
   s.files += %w( src/core/lib/gpr/string.h )
   s.files += %w( src/core/lib/gpr/string_windows.h )
@@ -123,7 +122,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/gpr/log_windows.cc )
   s.files += %w( src/core/lib/gpr/mpscq.cc )
   s.files += %w( src/core/lib/gpr/murmur_hash.cc )
-  s.files += %w( src/core/lib/gpr/object_registry.cc )
   s.files += %w( src/core/lib/gpr/string.cc )
   s.files += %w( src/core/lib/gpr/string_posix.cc )
   s.files += %w( src/core/lib/gpr/string_util_windows.cc )
@@ -266,6 +264,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/channel/handshaker.h )
   s.files += %w( src/core/lib/channel/handshaker_factory.h )
   s.files += %w( src/core/lib/channel/handshaker_registry.h )
+  s.files += %w( src/core/lib/channel/object_registry.cc )
   s.files += %w( src/core/lib/compression/algorithm_metadata.h )
   s.files += %w( src/core/lib/compression/message_compress.h )
   s.files += %w( src/core/lib/compression/stream_compression.h )
@@ -412,6 +411,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/channel/handshaker.cc )
   s.files += %w( src/core/lib/channel/handshaker_factory.cc )
   s.files += %w( src/core/lib/channel/handshaker_registry.cc )
+  s.files += %w( src/core/lib/channel/object_registry.cc )
   s.files += %w( src/core/lib/compression/compression.cc )
   s.files += %w( src/core/lib/compression/message_compress.cc )
   s.files += %w( src/core/lib/compression/stream_compression.cc )
diff --git a/grpc.gyp b/grpc.gyp
index 324f65215f1..43f7724ab40 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -182,7 +182,6 @@
         'src/core/lib/gpr/log_windows.cc',
         'src/core/lib/gpr/mpscq.cc',
         'src/core/lib/gpr/murmur_hash.cc',
-        'src/core/lib/gpr/object_registry.cc',
         'src/core/lib/gpr/string.cc',
         'src/core/lib/gpr/string_posix.cc',
         'src/core/lib/gpr/string_util_windows.cc',
@@ -235,6 +234,7 @@
         'src/core/lib/channel/handshaker.cc',
         'src/core/lib/channel/handshaker_factory.cc',
         'src/core/lib/channel/handshaker_registry.cc',
+        'src/core/lib/channel/object_registry.cc',
         'src/core/lib/compression/compression.cc',
         'src/core/lib/compression/message_compress.cc',
         'src/core/lib/compression/stream_compression.cc',
@@ -531,6 +531,7 @@
         'src/core/lib/channel/handshaker.cc',
         'src/core/lib/channel/handshaker_factory.cc',
         'src/core/lib/channel/handshaker_registry.cc',
+        'src/core/lib/channel/object_registry.cc',
         'src/core/lib/compression/compression.cc',
         'src/core/lib/compression/message_compress.cc',
         'src/core/lib/compression/stream_compression.cc',
@@ -745,6 +746,7 @@
         'src/core/lib/channel/handshaker.cc',
         'src/core/lib/channel/handshaker_factory.cc',
         'src/core/lib/channel/handshaker_registry.cc',
+        'src/core/lib/channel/object_registry.cc',
         'src/core/lib/compression/compression.cc',
         'src/core/lib/compression/message_compress.cc',
         'src/core/lib/compression/stream_compression.cc',
@@ -940,6 +942,7 @@
         'src/core/lib/channel/handshaker.cc',
         'src/core/lib/channel/handshaker_factory.cc',
         'src/core/lib/channel/handshaker_registry.cc',
+        'src/core/lib/channel/object_registry.cc',
         'src/core/lib/compression/compression.cc',
         'src/core/lib/compression/message_compress.cc',
         'src/core/lib/compression/stream_compression.cc',
diff --git a/package.xml b/package.xml
index 00b54d3dc12..98c2707e0f8 100644
--- a/package.xml
+++ b/package.xml
@@ -95,7 +95,6 @@
     <file baseinstalldir="/" name="src/core/lib/gpr/fork.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gpr/mpscq.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gpr/murmur_hash.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/object_registry.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gpr/spinlock.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gpr/string.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gpr/string_windows.h" role="src" />
@@ -130,7 +129,6 @@
     <file baseinstalldir="/" name="src/core/lib/gpr/log_windows.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gpr/mpscq.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gpr/murmur_hash.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/object_registry.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gpr/string.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gpr/string_posix.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gpr/string_util_windows.cc" role="src" />
@@ -273,6 +271,7 @@
     <file baseinstalldir="/" name="src/core/lib/channel/handshaker.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/handshaker_factory.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/handshaker_registry.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/channel/object_registry.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/algorithm_metadata.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/message_compress.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/stream_compression.h" role="src" />
@@ -419,6 +418,7 @@
     <file baseinstalldir="/" name="src/core/lib/channel/handshaker.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/handshaker_factory.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/handshaker_registry.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/channel/object_registry.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/compression.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/message_compress.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/stream_compression.cc" role="src" />
diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc
index 32cc5fff6b2..51fe70304b4 100644
--- a/src/core/ext/filters/client_channel/subchannel.cc
+++ b/src/core/ext/filters/client_channel/subchannel.cc
@@ -37,8 +37,8 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_tracer.h"
 #include "src/core/lib/channel/connected_channel.h"
+#include "src/core/lib/channel/object_registry.h"
 #include "src/core/lib/debug/stats.h"
-#include "src/core/lib/gpr/object_registry.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/manual_constructor.h"
 #include "src/core/lib/iomgr/sockaddr_utils.h"
diff --git a/src/core/lib/channel/channel_tracer.cc b/src/core/lib/channel/channel_tracer.cc
index bdad3c6067a..0a375074ef3 100644
--- a/src/core/lib/channel/channel_tracer.cc
+++ b/src/core/lib/channel/channel_tracer.cc
@@ -17,6 +17,7 @@
  */
 
 #include "src/core/lib/channel/channel_tracer.h"
+
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
@@ -25,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "src/core/lib/gpr/object_registry.h"
+#include "src/core/lib/channel/object_registry.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/lib/gpr/object_registry.cc b/src/core/lib/channel/object_registry.cc
similarity index 98%
rename from src/core/lib/gpr/object_registry.cc
rename to src/core/lib/channel/object_registry.cc
index 5c9e5416c2b..550bb6f788a 100644
--- a/src/core/lib/gpr/object_registry.cc
+++ b/src/core/lib/channel/object_registry.cc
@@ -16,7 +16,7 @@
  *
  */
 
-#include "src/core/lib/gpr/object_registry.h"
+#include "src/core/lib/channel/object_registry.h"
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/avl.h>
diff --git a/src/core/lib/gpr/object_registry.h b/src/core/lib/channel/object_registry.h
similarity index 100%
rename from src/core/lib/gpr/object_registry.h
rename to src/core/lib/channel/object_registry.h
diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc
index c60fe51f3f2..fcc5fd4311f 100644
--- a/src/core/lib/surface/channel.cc
+++ b/src/core/lib/surface/channel.cc
@@ -29,8 +29,8 @@
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_tracer.h"
+#include "src/core/lib/channel/object_registry.h"
 #include "src/core/lib/debug/stats.h"
-#include "src/core/lib/gpr/object_registry.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/manual_constructor.h"
 #include "src/core/lib/gprpp/memory.h"
diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc
index be930d97379..119616c23c5 100644
--- a/src/core/lib/surface/init.cc
+++ b/src/core/lib/surface/init.cc
@@ -29,10 +29,10 @@
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/connected_channel.h"
 #include "src/core/lib/channel/handshaker_registry.h"
+#include "src/core/lib/channel/object_registry.h"
 #include "src/core/lib/debug/stats.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gpr/fork.h"
-#include "src/core/lib/gpr/object_registry.h"
 #include "src/core/lib/gpr/thd_internal.h"
 #include "src/core/lib/http/parser.h"
 #include "src/core/lib/iomgr/call_combiner.h"
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 17dd792be8e..2cd796b52f3 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -36,7 +36,6 @@ CORE_SOURCE_FILES = [
     'src/core/lib/gpr/log_windows.cc',
     'src/core/lib/gpr/mpscq.cc',
     'src/core/lib/gpr/murmur_hash.cc',
-    'src/core/lib/gpr/object_registry.cc',
     'src/core/lib/gpr/string.cc',
     'src/core/lib/gpr/string_posix.cc',
     'src/core/lib/gpr/string_util_windows.cc',
@@ -70,6 +69,7 @@ CORE_SOURCE_FILES = [
     'src/core/lib/channel/handshaker.cc',
     'src/core/lib/channel/handshaker_factory.cc',
     'src/core/lib/channel/handshaker_registry.cc',
+    'src/core/lib/channel/object_registry.cc',
     'src/core/lib/compression/compression.cc',
     'src/core/lib/compression/message_compress.cc',
     'src/core/lib/compression/stream_compression.cc',
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 1cf985d1edc..60122540d67 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -943,6 +943,7 @@ src/core/lib/channel/context.h \
 src/core/lib/channel/handshaker.h \
 src/core/lib/channel/handshaker_factory.h \
 src/core/lib/channel/handshaker_registry.h \
+src/core/lib/channel/object_registry.cc \
 src/core/lib/compression/algorithm_metadata.h \
 src/core/lib/compression/message_compress.h \
 src/core/lib/compression/stream_compression.h \
@@ -956,7 +957,6 @@ src/core/lib/gpr/env.h \
 src/core/lib/gpr/fork.h \
 src/core/lib/gpr/mpscq.h \
 src/core/lib/gpr/murmur_hash.h \
-src/core/lib/gpr/object_registry.h \
 src/core/lib/gpr/spinlock.h \
 src/core/lib/gpr/string.h \
 src/core/lib/gpr/string_windows.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 998a3749a2e..49642dbb664 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1050,6 +1050,8 @@ src/core/lib/channel/handshaker_factory.cc \
 src/core/lib/channel/handshaker_factory.h \
 src/core/lib/channel/handshaker_registry.cc \
 src/core/lib/channel/handshaker_registry.h \
+src/core/lib/channel/object_registry.cc \
+src/core/lib/channel/object_registry.cc \
 src/core/lib/compression/algorithm_metadata.h \
 src/core/lib/compression/compression.cc \
 src/core/lib/compression/message_compress.cc \
@@ -1093,8 +1095,6 @@ src/core/lib/gpr/mpscq.cc \
 src/core/lib/gpr/mpscq.h \
 src/core/lib/gpr/murmur_hash.cc \
 src/core/lib/gpr/murmur_hash.h \
-src/core/lib/gpr/object_registry.cc \
-src/core/lib/gpr/object_registry.h \
 src/core/lib/gpr/spinlock.h \
 src/core/lib/gpr/string.cc \
 src/core/lib/gpr/string.h \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index c4109162aaf..5fd6e5f60fb 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -7865,7 +7865,6 @@
       "src/core/lib/gpr/log_windows.cc", 
       "src/core/lib/gpr/mpscq.cc", 
       "src/core/lib/gpr/murmur_hash.cc", 
-      "src/core/lib/gpr/object_registry.cc", 
       "src/core/lib/gpr/string.cc", 
       "src/core/lib/gpr/string_posix.cc", 
       "src/core/lib/gpr/string_util_windows.cc", 
@@ -7929,7 +7928,6 @@
       "src/core/lib/gpr/fork.h", 
       "src/core/lib/gpr/mpscq.h", 
       "src/core/lib/gpr/murmur_hash.h", 
-      "src/core/lib/gpr/object_registry.h", 
       "src/core/lib/gpr/spinlock.h", 
       "src/core/lib/gpr/string.h", 
       "src/core/lib/gpr/string_windows.h", 
@@ -7979,7 +7977,6 @@
       "src/core/lib/gpr/fork.h", 
       "src/core/lib/gpr/mpscq.h", 
       "src/core/lib/gpr/murmur_hash.h", 
-      "src/core/lib/gpr/object_registry.h", 
       "src/core/lib/gpr/spinlock.h", 
       "src/core/lib/gpr/string.h", 
       "src/core/lib/gpr/string_windows.h", 
@@ -8086,6 +8083,7 @@
       "src/core/lib/channel/handshaker.cc", 
       "src/core/lib/channel/handshaker_factory.cc", 
       "src/core/lib/channel/handshaker_registry.cc", 
+      "src/core/lib/channel/object_registry.cc", 
       "src/core/lib/compression/compression.cc", 
       "src/core/lib/compression/message_compress.cc", 
       "src/core/lib/compression/stream_compression.cc", 
@@ -8244,6 +8242,7 @@
       "src/core/lib/channel/handshaker.h", 
       "src/core/lib/channel/handshaker_factory.h", 
       "src/core/lib/channel/handshaker_registry.h", 
+      "src/core/lib/channel/object_registry.cc", 
       "src/core/lib/compression/algorithm_metadata.h", 
       "src/core/lib/compression/message_compress.h", 
       "src/core/lib/compression/stream_compression.h", 
@@ -8386,6 +8385,7 @@
       "src/core/lib/channel/handshaker.h", 
       "src/core/lib/channel/handshaker_factory.h", 
       "src/core/lib/channel/handshaker_registry.h", 
+      "src/core/lib/channel/object_registry.cc", 
       "src/core/lib/compression/algorithm_metadata.h", 
       "src/core/lib/compression/message_compress.h", 
       "src/core/lib/compression/stream_compression.h",