Are universal consciousness and the spirit the same thing?

In other words, once we go to heaven, are we the universal consciousness?

I would think that souls or spirits are still individuals and will need to learn lessons. Universal consciousness is something that's unchanging, ultimate, the essence of everything, authenticity, the knowing, where "I" doesn't exist.