Mostly a matter of using the new composite types from the updated id/auth dependency.
Add tests for that too.
