Use id for AAD in keystore (like in the migration)