diff --git a/.pylintrc b/.pylintrc
index 9b337d7..83c5663 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -8,6 +8,7 @@ enable=anomalous-backslash-in-string,
         bare-except,
         broad-exception-caught,
         consider-using-f-string,
+        cyclic-import,
         dangerous-default-value,
         disallowed-name,
         empty-docstring,
diff --git a/src/wuttjamaican/db/model/auth.py b/src/wuttjamaican/db/model/auth.py
index abdd7f2..5ba7bfe 100644
--- a/src/wuttjamaican/db/model/auth.py
+++ b/src/wuttjamaican/db/model/auth.py
@@ -45,7 +45,8 @@ import sqlalchemy as sa
 from sqlalchemy import orm
 from sqlalchemy.ext.associationproxy import association_proxy
 
-from . import Base, uuid_column, uuid_fk_column
+from wuttjamaican.db.util import uuid_column, uuid_fk_column
+from wuttjamaican.db.model.base import Base
 
 
 class Role(Base): # pylint: disable=too-few-public-methods
diff --git a/src/wuttjamaican/db/model/batch.py b/src/wuttjamaican/db/model/batch.py
index a922354..017a549 100644
--- a/src/wuttjamaican/db/model/batch.py
+++ b/src/wuttjamaican/db/model/batch.py
@@ -31,7 +31,8 @@ from sqlalchemy import orm
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.orderinglist import ordering_list
 
-from wuttjamaican.db.model import uuid_column, User
+from wuttjamaican.db.model.base import uuid_column
+from wuttjamaican.db.model.auth import User
 from wuttjamaican.db.util import UUID
 
 
diff --git a/src/wuttjamaican/db/model/upgrades.py b/src/wuttjamaican/db/model/upgrades.py
index eef9d0d..010e26e 100644
--- a/src/wuttjamaican/db/model/upgrades.py
+++ b/src/wuttjamaican/db/model/upgrades.py
@@ -30,9 +30,9 @@ import sqlalchemy as sa
 from sqlalchemy import orm
 
 from wuttjamaican.enum import UpgradeStatus
-from wuttjamaican.db.util import UUID
+from wuttjamaican.db.util import UUID, uuid_column, uuid_fk_column
 from wuttjamaican.util import make_true_uuid
-from . import Base, uuid_column, uuid_fk_column
+from wuttjamaican.db.model.base import Base
 
 
 class Upgrade(Base): # pylint: disable=too-few-public-methods