diff --git a/models/forgefed/federationinfo.go b/models/forgefed/federationinfo.go
index 53f2c3e5e1..417feb1e19 100644
--- a/models/forgefed/federationinfo.go
+++ b/models/forgefed/federationinfo.go
@@ -13,7 +13,7 @@ import (
 type FederationInfo struct {
 	ID             int64              `xorm:"pk autoincr"`
 	HostFqdn       string             `xorm:"host_fqdn UNIQUE INDEX VARCHAR(255) NOT NULL"`
-	NodeInfo       NodeInfo           `xorm:"NOT NULL"`
+	NodeInfo       NodeInfo           `xorm:"extends NOT NULL"`
 	LatestActivity timeutil.TimeStamp `xorm:"NOT NULL"`
 	Create         timeutil.TimeStamp `xorm:"created"`
 	Updated        timeutil.TimeStamp `xorm:"updated"`
diff --git a/models/forgefed/nodeinfo.go b/models/forgefed/nodeinfo.go
index cdf7a51f99..26d24ae6a4 100644
--- a/models/forgefed/nodeinfo.go
+++ b/models/forgefed/nodeinfo.go
@@ -97,7 +97,6 @@ func (id ActorID) AsWellKnownNodeInfoUri() string {
 // NodeInfo data type
 // swagger:model
 type NodeInfo struct {
-	ID     int64 `xorm:"pk autoincr"`
 	Source SourceType
 }