diff --git a/commonspace/object/acl/list/aclrecordbuilder.go b/commonspace/object/acl/list/aclrecordbuilder.go
index c7ba4390..8f0a0071 100644
--- a/commonspace/object/acl/list/aclrecordbuilder.go
+++ b/commonspace/object/acl/list/aclrecordbuilder.go
@@ -88,7 +88,7 @@ func (a *aclRecordBuilder) BuildUserJoin(acceptPrivKeyBytes []byte, encSymKeyByt
 		Identity:           state.Identity(),
 		Data:               marshalledJoin,
 		CurrentReadKeyHash: state.CurrentReadKeyHash(),
-		Timestamp:          time.Now().UnixNano(),
+		Timestamp:          time.Now().Unix(),
 	}
 	marshalledRecord, err := aclRecord.Marshal()
 	if err != nil {
diff --git a/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go b/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go
index ac268df5..35a17bda 100644
--- a/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go
+++ b/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go
@@ -126,7 +126,7 @@ func (t *AclListStorageBuilder) parseRecord(rec *Record, prevId string) *aclreco
 		Identity:           []byte(t.keychain.GetIdentity(rec.Identity)),
 		Data:               bytes,
 		CurrentReadKeyHash: k.Hash,
-		Timestamp:          time.Now().UnixNano(),
+		Timestamp:          time.Now().Unix(),
 	}
 }
 
diff --git a/commonspace/object/tree/objecttree/changebuilder.go b/commonspace/object/tree/objecttree/changebuilder.go
index 8ef6e5a0..8e312309 100644
--- a/commonspace/object/tree/objecttree/changebuilder.go
+++ b/commonspace/object/tree/objecttree/changebuilder.go
@@ -165,7 +165,7 @@ func (c *changeBuilder) Build(payload BuilderContent) (ch *Change, rawIdChange *
 		AclHeadId:          payload.AclHeadId,
 		SnapshotBaseId:     payload.SnapshotBaseId,
 		CurrentReadKeyHash: payload.CurrentReadKeyHash,
-		Timestamp:          time.Now().UnixNano(),
+		Timestamp:          time.Now().Unix(),
 		Identity:           payload.Identity,
 		IsSnapshot:         payload.IsSnapshot,
 	}
diff --git a/commonspace/object/tree/objecttree/objecttreefactory.go b/commonspace/object/tree/objecttree/objecttreefactory.go
index cfceefe0..e3ec5c6f 100644
--- a/commonspace/object/tree/objecttree/objecttreefactory.go
+++ b/commonspace/object/tree/objecttree/objecttreefactory.go
@@ -76,7 +76,7 @@ func CreateObjectTreeRoot(payload ObjectTreeCreatePayload, aclList list.AclList)
 	if err != nil {
 		return
 	}
-	return createObjectTreeRoot(payload, time.Now().UnixNano(), bytes, aclList)
+	return createObjectTreeRoot(payload, time.Now().Unix(), bytes, aclList)
 }
 
 func DeriveObjectTreeRoot(payload ObjectTreeCreatePayload, aclList list.AclList) (root *treechangeproto.RawTreeChangeWithId, err error) {
@@ -126,7 +126,7 @@ func CreateObjectTree(
 	if err != nil {
 		return
 	}
-	return createObjectTree(payload, time.Now().UnixNano(), bytes, aclList, createStorage)
+	return createObjectTree(payload, time.Now().Unix(), bytes, aclList, createStorage)
 }
 
 func createObjectTree(
diff --git a/commonspace/object/tree/objecttree/tree_test.go b/commonspace/object/tree/objecttree/tree_test.go
index 8bbed0cc..4bda3527 100644
--- a/commonspace/object/tree/objecttree/tree_test.go
+++ b/commonspace/object/tree/objecttree/tree_test.go
@@ -125,7 +125,7 @@ func TestTree_Hash(t *testing.T) {
 }
 
 func TestTree_AddFuzzy(t *testing.T) {
-	rand.Seed(time.Now().UnixNano())
+	rand.Seed(time.Now().Unix())
 	getChanges := func() []*Change {
 		changes := []*Change{
 			newChange("1", "root", "root"),
diff --git a/commonspace/payloads.go b/commonspace/payloads.go
index 8c816343..ba45dff6 100644
--- a/commonspace/payloads.go
+++ b/commonspace/payloads.go
@@ -37,7 +37,7 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload sp
 	}
 	header := &spacesyncproto.SpaceHeader{
 		Identity:           identity,
-		Timestamp:          time.Now().UnixNano(),
+		Timestamp:          time.Now().Unix(),
 		SpaceType:          payload.SpaceType,
 		SpaceHeaderPayload: payload.SpacePayload,
 		ReplicationKey:     payload.ReplicationKey,
@@ -82,7 +82,7 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload sp
 		SpaceId:            spaceId,
 		EncryptedReadKey:   encReadKey,
 		CurrentReadKeyHash: readKeyHash,
-		Timestamp:          time.Now().UnixNano(),
+		Timestamp:          time.Now().Unix(),
 	}
 	rawWithId, err := marshalAclRoot(aclRoot, payload.SigningKey)
 	if err != nil {
@@ -103,7 +103,7 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload sp
 		SpaceId:    spaceId,
 		Seed:       spaceSettingsSeed,
 		ChangeType: SpaceReserved,
-		Timestamp:  time.Now().UnixNano(),
+		Timestamp:  time.Now().Unix(),
 	})
 	if err != nil {
 		return