diff --git a/polygraph/types/basic_type.py b/polygraph/types/basic_type.py
index 6cbce15..7e889d1 100644
--- a/polygraph/types/basic_type.py
+++ b/polygraph/types/basic_type.py
@@ -4,6 +4,14 @@ from polygraph.types.definitions import TypeDefinition, TypeKind
 from polygraph.utils.trim_docstring import trim_docstring
 
 
+def get_field_list(namespace):
+    return [
+        value.__field__
+        for value in namespace.values()
+        if hasattr(value, "__field__")
+    ]
+
+
 class PolygraphTypeMeta(type):
     def __new__(cls, name, bases, namespace):
         default_description = trim_docstring(namespace.get("__doc__", ""))
@@ -22,7 +30,7 @@ class PolygraphTypeMeta(type):
                 kind=getattr(meta, "kind"),
                 name=getattr(meta, "name", name) or name,
                 description=getattr(meta, "description", default_description),
-                fields=None,  # FIXME
+                fields=get_field_list(namespace),
                 possible_types=getattr(meta, "possible_types", None),
                 interfaces=None,  # FIXME
                 enum_values=None,  # FIXME
diff --git a/polygraph/types/object_type.py b/polygraph/types/object_type.py
index 7c6a0f8..9567e1b 100644
--- a/polygraph/types/object_type.py
+++ b/polygraph/types/object_type.py
@@ -1,7 +1,5 @@
-import inspect
-from collections import OrderedDict
-
 from polygraph.types.basic_type import PolygraphOutputType, PolygraphType
+from polygraph.types.definitions import TypeKind
 
 
 class ObjectType(PolygraphOutputType, PolygraphType, dict):
@@ -10,12 +8,5 @@ class ObjectType(PolygraphOutputType, PolygraphType, dict):
     a value of a specific type.
     """
 
-    @classmethod
-    def get_field_map(cls):
-        field_map = OrderedDict()
-        for _, method in inspect.getmembers(cls, predicate=inspect.ismethod):
-            if hasattr(method, '__fieldname__') and hasattr(method, '__field__'):
-                fieldname = method.__fieldname__
-                field = method.__field__
-                field_map[fieldname] = field
-        return field_map
+    class Type:
+        kind = TypeKind.OBJECT

ObjectType type definition
diff --git a/polygraph/types/tests/test_object_type.py b/polygraph/types/tests/test_object_type.py
index 9ffd4d4..5e380b3 100644
--- a/polygraph/types/tests/test_object_type.py
+++ b/polygraph/types/tests/test_object_type.py
@@ -1,6 +1,7 @@
 from unittest import TestCase
 
 from polygraph.exceptions import PolygraphValueError
+from polygraph.types.api import typedef
 from polygraph.types.decorators import field
 from polygraph.types.object_type import ObjectType
 from polygraph.types.scalar import Int, String
@@ -27,6 +28,15 @@ class HelloWorldObject(ObjectType):
 
 
 class SimpleObjectTypeTest(TestCase):
+    def test_object_type_definition(self):
+        type_info = typedef(HelloWorldObject)
+        self.assertEqual(type_info.name, "HelloWorldObject")
+        self.assertEqual(type_info.description, "This is a test object")
+        self.assertEqual(
+            set([f.name for f in type_info.fields]),
+            set(["greet_world", "greet_you", "bad_resolver"]),
+        )
+
     def test_bare_resolver(self):
         hello_world = HelloWorldObject()
         self.assertEqual(hello_world.greet_world(), String("Hello world!"))

pip install -e .[dev]
parse_log_pytest
pytest
pytest
3.6
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
args==0.1.0
attrs @ file:///opt/conda/conda-bld/attrs_1642510447205/work
autopep8==2.0.4
backcall==0.2.0
certifi==2021.5.30
charset-normalizer==2.0.12
clint==0.5.1
coverage==6.2
decorator==5.1.1
flake8==2.5.5
graphql-core==3.2.6
idna==3.10
importlib-metadata @ file:///tmp/build/80754af9/importlib-metadata_1631916693255/work
iniconfig @ file:///home/linux1/recipes/ci/iniconfig_1610983019677/work
ipython==7.16.3
ipython-genutils==0.2.0
isort==5.10.1
jedi==0.17.2
mccabe==0.4.0
more-itertools @ file:///tmp/build/80754af9/more-itertools_1637733554872/work
packaging @ file:///tmp/build/80754af9/packaging_1637314298585/work
parso==0.7.1
pep8==1.7.1
pexpect==4.9.0
pickleshare==0.7.5
pkginfo==1.10.0
pluggy @ file:///tmp/build/80754af9/pluggy_1615976315926/work
-e git+https://github.com/polygraph-python/polygraph.git@14fcd132bb737f5bb0159b818f935c0e27131a13#egg=polygraph
prompt-toolkit==3.0.36
ptyprocess==0.7.0
pudb==2017.1.2
py @ file:///opt/conda/conda-bld/py_1644396412707/work
pycodestyle==2.10.0
pyflakes==1.0.0
Pygments==2.14.0
pyparsing @ file:///tmp/build/80754af9/pyparsing_1635766073266/work
pytest==6.2.4
requests==2.27.1
requests-toolbelt==1.0.0
six==1.17.0
toml @ file:///tmp/build/80754af9/toml_1616166611790/work
tomli==1.2.3
traitlets==4.3.3
twine==1.8.1
typing_extensions @ file:///opt/conda/conda-bld/typing_extensions_1647553014482/work
urllib3==1.26.20
urwid==2.1.2
wcwidth==0.2.13
zipp @ file:///tmp/build/80754af9/zipp_1633618647012/work

name: polygraph
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - attrs=21.4.0=pyhd3eb1b0_0
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2021.5.30=py36h06a4308_0
  - importlib-metadata=4.8.1=py36h06a4308_0
  - importlib_metadata=4.8.1=hd3eb1b0_0
  - iniconfig=1.1.1=pyhd3eb1b0_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.3=he6710b0_2
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - more-itertools=8.12.0=pyhd3eb1b0_0
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - packaging=21.3=pyhd3eb1b0_0
  - pip=21.2.2=py36h06a4308_0
  - pluggy=0.13.1=py36h06a4308_0
  - py=1.11.0=pyhd3eb1b0_0
  - pyparsing=3.0.4=pyhd3eb1b0_0
  - pytest=6.2.4=py36h06a4308_2
  - python=3.6.13=h12debd9_1
  - readline=8.2=h5eee18b_0
  - setuptools=58.0.4=py36h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - toml=0.10.2=pyhd3eb1b0_0
  - typing_extensions=4.1.1=pyh06a4308_0
  - wheel=0.37.1=pyhd3eb1b0_0
  - xz=5.6.4=h5eee18b_1
  - zipp=3.6.0=pyhd3eb1b0_0
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - args==0.1.0
      - autopep8==2.0.4
      - backcall==0.2.0
      - charset-normalizer==2.0.12
      - clint==0.5.1
      - coverage==6.2
      - decorator==5.1.1
      - flake8==2.5.5
      - graphql-core==3.2.6
      - idna==3.10
      - ipython==7.16.3
      - ipython-genutils==0.2.0
      - isort==5.10.1
      - jedi==0.17.2
      - mccabe==0.4.0
      - parso==0.7.1
      - pep8==1.7.1
      - pexpect==4.9.0
      - pickleshare==0.7.5
      - pkginfo==1.10.0
      - prompt-toolkit==3.0.36
      - ptyprocess==0.7.0
      - pudb==2017.1.2
      - pycodestyle==2.10.0
      - pyflakes==1.0.0
      - pygments==2.14.0
      - requests==2.27.1
      - requests-toolbelt==1.0.0
      - six==1.17.0
      - tomli==1.2.3
      - traitlets==4.3.3
      - twine==1.8.1
      - urllib3==1.26.20
      - urwid==2.1.2
      - wcwidth==0.2.13
prefix: /opt/conda/envs/polygraph

polygraph/types/tests/test_object_type.py::SimpleObjectTypeTest::test_object_type_definition
polygraph/types/tests/test_object_type.py::SimpleObjectTypeTest::test_bad_resolver polygraph/types/tests/test_object_type.py::SimpleObjectTypeTest::test_bare_resolver polygraph/types/tests/test_object_type.py::SimpleObjectTypeTest::test_resolver_argument
polygraph/types/object_type.py polygraph/types/basic_type.py
polygraph/types/object_type.py polygraph/types/basic_type.py