diff --git a/src/trendlines/orm.py b/src/trendlines/orm.py
index cc6e9ad..8a0f499 100644
--- a/src/trendlines/orm.py
+++ b/src/trendlines/orm.py
@@ -3,6 +3,7 @@
 from datetime import datetime
 from pathlib import Path
 
+from peewee import AutoField
 from peewee import SqliteDatabase
 from peewee import Model
 from peewee import IntegerField
@@ -60,7 +61,7 @@ class Metric(InternalModel):
     Table holding all of the Metric information.
     """
 
-    metric_id = IntegerField(primary_key=True)
+    metric_id = AutoField()
     name = CharField(max_length=120, unique=True)
     units = CharField(max_length=24, null=True)
     upper_limit = FloatField(null=True)
@@ -82,7 +83,7 @@ class DataPoint(DataModel):
     naive :class:`datetime.datetime` objects (no timezone info).
     """
 
-    datapoint_id = IntegerField(primary_key=True)
+    datapoint_id = AutoField()
     metric = ForeignKeyField(Metric, backref="datapoints",
                              on_delete="CASCADE")
     value = FloatField()