Another way to look at the baptism by, from, through the Holy Spirit, is to view the water baptism of John the Baptist as a preparation for the Holy Spirit baptism that believers receive upon salvation. It is symbolic of the out pouring of the Spirit on all flesh. Now I am not going to use the usual verses, but to draw the connection of the power of Holy Spirit from the OT to eternity. The item to pay attention to is that the Holy Spirit always testifies of Christ: 

Some extracts from psalms where David describes, identifies, partakes and traces the prophetic outpourings of the Holy Spirit: 

Psalms 36:8 - They drink their fill of the abundance of Your house; And You give them to drink of the river of Your delights.  

Psalms 46:4 - There is a river whose streams make glad the city of God, The holy dwelling places of the Most High. 

Psalms 65:9 - You visit the earth and cause it to overflow; You greatly enrich it; The stream of God is full of water; You prepare their grain, for thus You prepare the earth.  

Then jump forward to eternity, courtesy of Ezekiel, where he describes the river flowing forth beneath the throne and alter, the river of blessing to the whole world in the millennium kingdom. :  

Ezekiel 47:6-12:  He said to me, "Son of man, have you seen this?" Then he brought me back to the bank of the river. Now when I had returned, behold, on the bank of the river there were very many trees on the one side and on the other. .. It will come about that every living creature which swarms in every place where the river goes will live…. They will bear every month because their water flows from the sanctuary, and their fruit will be for food and their leaves for healing." 

Now compare the above with:  

Revelation 22:1 - Then he showed me a river of the water of life, clear as crystal, coming from the throne of God and of the Lamb,  

Revelation 22:17 - The Spirit and the bride say, "Come." And let the one who hears say, "Come." And let the one who is thirsty come; let the one who wishes take the water of life without cost.  

Finally, here is Christ’s own words where all of the references are neatly connected within Himself:  

John 4:13 - Jesus answered and said to her, "Everyone who drinks of this water will thirst again; but whoever drinks of the water that I will give him shall never thirst; but the water that I will give him will become in him a well of water springing up to eternal life." 

We can see from Psalms that David identifies the Holy Spirit and he drinks of these living waters (the Holy Spirit). Today we who are saved are baptized by these very same  living waters (the Holy Spirit of course) so that we too can drink of these living waters, and we will continue to do so in the millennium kingdom and for eternity.